From f113610583945e7bba7a29cf01f1714fe7f94367 Mon Sep 17 00:00:00 2001
From: Anna Larch <anna@nextcloud.com>
Date: Tue, 19 Jul 2022 13:16:52 +0200
Subject: [PATCH] fixup! Add imip processing

---
 lib/Service/IMipService.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/Service/IMipService.php b/lib/Service/IMipService.php
index 6974de450d..59f46ed9d6 100644
--- a/lib/Service/IMipService.php
+++ b/lib/Service/IMipService.php
@@ -98,9 +98,9 @@ public function process() {
 			$account = $accounts[$mailbox->getAccountId()];
 			// mailbox not in collated array, maybe specal use?
 			// no processing for drafts and sent items
-			if ($mailbox->getSpecialUse() === '["sent"]' || $mailbox->getSpecialUse() === '["drafts"]') { // does this need more use cases? Also probably won't work? @todo
+			if ($mailbox->isSpecialUse("sent") || $mailbox->isSpecialUse("drafts")) { // does this need more use cases? Also probably won't work? @todo
 				$message->setImipProcessed(true); // Silently drop from passing to DAV and mark as processed, so we won't run into this message again.
-				$processedMessages[$account->getId()] = $message;
+				$processedMessages[$account->getId()][] = $message;
 				continue;
 			}
 
@@ -109,14 +109,14 @@ public function process() {
 				$imapMessage = $this->mailManager->getImapMessage($account, $mailbox, $message->getUid());
 			} catch (ServiceException $e) {
 				$message->setImipError(true);
-				$processedMessages[$account->getId()] = $message;
+				$processedMessages[$account->getId()][] = $message;
 				continue;
 			}
 
 			if (empty($imapMessage->scheduling)) {
 				// No scheduling info, maybe the DB is wrong
 				$message->setImipError(true);
-				$processedMessages[$account->getId()] = $message;
+				$processedMessages[$account->getId()][] = $message;
 				continue;
 			}
 
@@ -131,12 +131,15 @@ public function process() {
 			}
 			$message->setImipProcessed($processed);
 			$message->setImipError(!$processed);
-			$processedMessages[$account->getId()] = $message;
+			$processedMessages[$account->getId()][] = $message;
 		}
 
-		foreach ($processedMessages as $accountId => $messages) {
+		foreach ($accountIds as $accountId) {
+			if (!isset($processedMessages[$accountId])) {
+				continue;
+			}
 			try {
-				$this->messageMapper->updateBulk($accounts[$accountId], false, $messages);
+				$this->messageMapper->updateBulk($accounts[$accountId], false, $processedMessages[$accountId]);
 			} catch (\Throwable $e) {
 				$this->logger->error('Could not update iMip messages for account ' . $accountId, ['exception' => $e]);
 			}