Put message in URL for autoload regarding issue #100 and Nextcloud unified search #96

dev/Common/Links.js

@@ -113,19 +113,24 @@ export const
 	 * @param {number=} threadUid = 0
 	 * @returns {string}
 	 */
-	mailBox = (folder, page, search, threadUid) => {
+	mailBox = (folder, page, search, threadUid, messageUid) => {
 		let result = [HASH_PREFIX + 'mailbox'];
 
 		if (folder) {
 			result.push(folder + (threadUid ? '~' + threadUid : ''));
 		}
 
+		if (messageUid) {
+			result.push('m' + messageUid);
+		} else {
 			page = pInt(page, 1);
 			if (1 < page) {
 				result.push('p' + page);
 			}
-
 			search && result.push(encodeURI(search));
+		}
 
 		return result.join('/');
-	};
+	},
+
+	mailBoxMessage = (folder, messageUid) => mailBox(folder, 1, '', 0, pInt(messageUid));

dev/Screen/User/MailBox.js

@@ -11,6 +11,7 @@ import { AppUserStore } from 'Stores/User/App';
 import { AccountUserStore } from 'Stores/User/Account';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
+import { MessageUserStore } from 'Stores/User/Message';
 import { ThemeStore } from 'Stores/Theme';
 
 import { SystemDropDownUserView } from 'View/User/SystemDropDown';
@@ -20,6 +21,9 @@ import { MailMessageView } from 'View/User/MailBox/MessageView';
 
 import { AbstractScreen } from 'Knoin/AbstractScreen';
 
+import { MessageModel } from 'Model/Message';
+import { populateMessageBody } from 'Common/UtilsUser';
+
 export class MailBoxUserScreen extends AbstractScreen {
 	constructor() {
 		var styleSheet = createElement('style');
@@ -69,17 +73,22 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 * @param {string} search
 	 * @returns {void}
 	 */
-	onRoute(folderHash, page, search) {
+	onRoute(folderHash, page, search, messageUid) {
 		const folder = getFolderFromCacheList(getFolderFullName(folderHash.replace(/~([\d]+)$/, '')));
 		if (folder) {
-			let threadUid = folderHash.replace(/^.+~(\d+)$/, '$1');
-
 			FolderUserStore.currentFolder(folder);
-
 			MessagelistUserStore.page(1 > page ? 1 : page);
 			MessagelistUserStore.listSearch(search);
+			if (messageUid) {
+				let message = new MessageModel;
+				message.folder = folderHash;
+				message.uid = messageUid;
+				MessageUserStore.message(message);
+				populateMessageBody(MessageUserStore.message());
+			} else {
+				let threadUid = folderHash.replace(/^.+~(\d+)$/, '$1');
 				MessagelistUserStore.threadUid((folderHash === threadUid) ? 0 : pInt(threadUid));
-
+			}
 			MessagelistUserStore.reload();
 		}
 	}
@@ -145,6 +154,10 @@ export class MailBoxUserScreen extends AbstractScreen {
 			[/^([a-zA-Z0-9.~_-]+)\/(.+)\/?$/, { normalize_: (request, vals) =>
 				[folder(request, vals), 1, decodeURI(pString(vals[1]))]
 			}],
+			// Message: {folder}/m{uid}(/{search})?
+			[/^([a-zA-Z0-9.~_-]+)\/m([1-9][0-9]*)(?:\/(.+))?$/, { normalize_: (request, vals) =>
+				[folder(request, vals), 1, pString(vals[2]), pString(vals[1])]
+			}],
 			// Page: {folder}/p{int}(/{search})?
 			[/^([a-zA-Z0-9.~_-]+)\/p([1-9][0-9]*)(?:\/(.+))?$/, { normalize_: fNormS }]
 		];

dev/View/User/MailBox/MessageList.js

@@ -200,10 +200,10 @@ export class MailMessageList extends AbstractViewRight {
 					hasher.setHash(mailBox(sFolder));
 				}
 				if (sFolder && iUid) {
-					MessageUserStore.message(MessageModel.fromMessageListItem(null));
+					let message = new MessageModel;
-					MessageUserStore.message().folder = sFolder;
+					message.folder = sFolder;
-					MessageUserStore.message().uid = iUid;
+					message.uid = iUid;
-
+					MessageUserStore.message(message);
 					populateMessageBody(MessageUserStore.message());
 				} else {
 					MessageUserStore.message(null);

integrations/nextcloud/snappymail/lib/Search/Provider.php

@@ -20,6 +20,18 @@ use OCP\Search\SearchResultEntry;
  */
 class Provider implements IProvider
 {
+	/** @var IL10N */
+	private $l10n;
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
+	public function __construct(IL10N $l10n, IURLGenerator $urlGenerator)
+	{
+		$this->l10n = $l10n;
+		$this->urlGenerator = $urlGenerator;
+	}
+
 	public function getId(): string
 	{
 		return Application::APP_ID;
@@ -85,8 +97,10 @@ class Provider implements IProvider
 					$Message->Subject(),
 					// subline
 					$Message->From()->ToString(),
-					// resourceUrl
+					// resourceUrl /index.php/apps/snappymail/#/mailbox/INBOX/p2/text=an&unseen
-					'', // TODO $this->urlGenerator->linkToRouteAbsolute(),
+					$this->urlGenerator->linkToRoute('snappymail.page.index')
+						. '#/mailbox/INBOX/m' . $Message->Uid()
+						. '/' . \rawurlencode($oParams->sSearch),
 					// icon
 					'icon-mail',
 					// rounded