fixup! feat: jmap support - part 2

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

Author: SebastianKrupinski

lib/IMAP/ImapMessageConnector.php

@@ -192,7 +192,7 @@ public function moveMessages(Account $account, Mailbox $targetMailbox, Mailbox $
 				if ($newUid === null) {
 					// The IMAP server does not support UIDPLUS and the message has no Message-ID
 					// header, so the new UID is unknown. It will be reconciled on the next sync.
-					$this->logger->warning('Moved message but could not determine its new UID', [
+					$this->logger->debug('Moved message but could not determine its new UID', [
 						'userId' => $account->getUserId(),
 						'accountId' => $account->getId(),
 						'sourceMailboxId' => $sourceMailbox->getId(),

lib/Service/MailManager.php

@@ -240,17 +240,27 @@ public function moveMessages(Account $account, Mailbox $targetMailbox, Mailbox $
 		if ($messages === []) {
 			return [];
 		}
+		$sourceUids = [];
+		foreach ($messages as $message) {
+			$sourceUids[spl_object_id($message)] = $message->getUid();
+		}
+
 		// update remote store
 		$mutatedMessages = $this->protocolFactory
 			->messageConnector($account)
 			->moveMessages($account, $targetMailbox, $sourceMailbox, ...$messages);
 
 		// update local store
-		$this->dbMessageMapper->updateBulk($account, false, ...$mutatedMessages);
-
 		$mutatedUids = [];
 		foreach ($mutatedMessages as $mutatedMessage) {
+			$this->dbMessageMapper->update($mutatedMessage);
 			$mutatedUids[] = $mutatedMessage->getUid();
+
+			$this->eventDispatcher->dispatchTyped(new MessageDeletedEvent(
+				$account,
+				$sourceMailbox,
+				$sourceUids[spl_object_id($mutatedMessage)],
+			));
 		}
 
 		return $mutatedUids;
@@ -304,7 +314,9 @@ public function deleteMessages(Account $account, Mailbox $sourceMailbox, Message
 
 		// update local store
 		if ($operation === 'move') {
-			$this->dbMessageMapper->updateBulk($account, false, ...$mutatedMessages);
+			foreach ($mutatedMessages as $mutatedMessage) {
+				$this->dbMessageMapper->update($mutatedMessage);
+			}
 		}
 		if ($operation === 'delete') {
 			$mutatedUids = array_map(static fn (Message $message): int => $message->getUid(), $mutatedMessages);