fixup! perf(imap): FETCH only flags for partial message updates

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · May 4, 2023 · cd68c2b · cd68c2b
1 parent a3de319
commit cd68c2b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/IMAP/MessageMapper.php b/lib/IMAP/MessageMapper.php
@@ -260,6 +260,7 @@ public function findFlagsByIds(Horde_Imap_Client_Base $client,
 								   string $userId,
 								   bool $loadBody = false): array {
 		$query = new Horde_Imap_Client_Fetch_Query();
+		$query->uid();
 		$query->flags();
 
 		return $this->findByQuery($ids, $query, $mailbox, $client, $loadBody, $userId);
@@ -331,11 +332,11 @@ private function findByQuery(array|Horde_Imap_Client_Ids $ids, Horde_Imap_Client
 		}
 
 		$fetchResults = array_values(array_filter($fetchResults, static function (Horde_Imap_Client_Data_Fetch $fetchResult) {
-			return $fetchResult->exists(Horde_Imap_Client::FETCH_ENVELOPE);
+			return $fetchResult->exists(Horde_Imap_Client::FETCH_UID);
 		}));
 
 		if (empty($fetchResults)) {
-			$this->logger->debug("findByIds in $mailbox got " . count($ids) . " UIDs but found none");
+			$this->logger->debug("findByQuery in $mailbox got " . count($ids) . " UIDs but found none");
 		} else {
 			$minFetched = $fetchResults[0]->getUid();
 			$maxFetched = $fetchResults[count($fetchResults) - 1]->getUid();
@@ -344,7 +345,7 @@ private function findByQuery(array|Horde_Imap_Client_Ids $ids, Horde_Imap_Client
 			} else {
 				$range = 'literals';
 			}
-			$this->logger->debug("findByIds in $mailbox got " . count($ids) . " UIDs ($range) and found " . count($fetchResults) . ". minFetched=$minFetched maxFetched=$maxFetched");
+			$this->logger->debug("findByQuery in $mailbox got " . count($ids) . " UIDs ($range) and found " . count($fetchResults) . ". minFetched=$minFetched maxFetched=$maxFetched");
 		}
 
 		return array_map(function (Horde_Imap_Client_Data_Fetch $fetchResult) use ($client, $mailbox, $loadBody, $userId) {