fixup! add sorting capabilities to mail

Signed-off-by: hamza221 <[email protected]>
nextcloud · Jul 21, 2023 · deddb89 · deddb89
1 parent 7d98c9a
commit deddb89
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/lib/Service/Search/MailSearch.php b/lib/Service/Search/MailSearch.php
@@ -158,7 +158,8 @@ public function findMessagesGlobally(IUser $user,
 		}
 
 		return $this->messageMapper->findByIds($user->getUID(),
-			$this->getIdsGlobally($user, $query, $limit)
+			$this->getIdsGlobally($user, $query, $limit),
+			'newest'
 		);
 	}
 

diff --git a/lib/Service/Sync/SyncService.php b/lib/Service/Sync/SyncService.php
@@ -26,6 +26,7 @@
 namespace OCA\Mail\Service\Sync;
 
 use OCA\Mail\Account;
+use OCA\Mail\Contracts\IUserPreferences;
 use OCA\Mail\Db\Mailbox;
 use OCA\Mail\Db\MailboxMapper;
 use OCA\Mail\Db\Message;
@@ -65,20 +66,26 @@ class SyncService {
 	/** @var MailboxSync */
 	private $mailboxSync;
 
+	/** @var IUserPreferences */
+	private $preferences;
+
 	public function __construct(ImapToDbSynchronizer $synchronizer,
 		FilterStringParser $filterStringParser,
 		MailboxMapper $mailboxMapper,
 		MessageMapper $messageMapper,
 		PreviewEnhancer $previewEnhancer,
 		LoggerInterface $logger,
-		MailboxSync $mailboxSync) {
+		MailboxSync $mailboxSync,
+		IUserPreferences $preferences) {
 		$this->synchronizer = $synchronizer;
 		$this->filterStringParser = $filterStringParser;
 		$this->mailboxMapper = $mailboxMapper;
 		$this->messageMapper = $messageMapper;
 		$this->previewEnhancer = $previewEnhancer;
 		$this->logger = $logger;
 		$this->mailboxSync = $mailboxSync;
+		$this->preferences = $preferences;
+
 	}
 
 	/**
@@ -156,18 +163,19 @@ private function getDatabaseSyncChanges(Account $account,
 		} else {
 			$newIds = $this->messageMapper->findNewIds($mailbox, $knownIds);
 		}
+		$order = $this->preferences->getPreference($this->currentUserId, 'sort-order', 'newest') === 'newest' ? 'DESC': 'ASC';
 
 		if ($query !== null) {
 			// Filter new messages to those that also match the current filter
 			$newUids = $this->messageMapper->findUidsForIds($mailbox, $newIds);
-			$newIds = $this->messageMapper->findIdsByQuery($mailbox, $query, null, $newUids);
+			$newIds = $this->messageMapper->findIdsByQuery($mailbox, $query, $order, null, $newUids);
 		}
 		$new = $this->messageMapper->findByMailboxAndIds($mailbox, $account->getUserId(), $newIds);
 
 		// TODO: $changed = $this->messageMapper->findChanged($account, $mailbox, $uids);
 		if ($query !== null) {
 			$changedUids = $this->messageMapper->findUidsForIds($mailbox, $knownIds);
-			$changedIds = $this->messageMapper->findIdsByQuery($mailbox, $query, null, $changedUids);
+			$changedIds = $this->messageMapper->findIdsByQuery($mailbox, $query, $order, null, $changedUids);
 		} else {
 			$changedIds = $knownIds;
 		}

diff --git a/tests/Unit/Service/Search/MailSearchTest.php b/tests/Unit/Service/Search/MailSearchTest.php
@@ -6,7 +6,7 @@
  * @copyright 2020 Christoph Wurst <[email protected]>
  *
  * @author 2020 Christoph Wurst <[email protected]>
- */MailSearchTest.php:99
+ *
  * @license GNU AGPL version 3 or any later version
  *
  * This program is free software: you can redistribute it and/or modify