fixup! feat: fiter messages by mention

Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
nextcloud · Oct 11, 2024 · 680c72e · 680c72e
1 parent c4cd27e
commit 680c72e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/IMAP/MessageMapper.php b/lib/IMAP/MessageMapper.php
@@ -901,7 +901,7 @@ public function getBodyStructureData(Horde_Imap_Client_Socket $client,
 			$textBodyId = $structure->findBody() ?? $structure->findBody('text');
 			$htmlBodyId = $structure->findBody('html');
 			if ($textBodyId === null && $htmlBodyId === null) {
-				return new MessageStructureData($hasAttachments, $text, $isImipMessage, $isEncrypted);
+				return new MessageStructureData($hasAttachments, $text, $isImipMessage, $isEncrypted, false);
 			}
 			$partsQuery = new Horde_Imap_Client_Fetch_Query();
 			if ($htmlBodyId !== null) {
@@ -927,7 +927,7 @@ public function getBodyStructureData(Horde_Imap_Client_Socket $client,
 			$part = $parts[$fetchData->getUid()];
 			// This is sus - why does this even happen? A delete / move in the middle of this processing?
 			if ($part === null) {
-				return new MessageStructureData($hasAttachments, $text, $isImipMessage, $isEncrypted);
+				return new MessageStructureData($hasAttachments, $text, $isImipMessage, $isEncrypted, false);
 			}
 
 
@@ -963,12 +963,16 @@ public function getBodyStructureData(Horde_Imap_Client_Socket $client,
 					$textBody,
 					$isImipMessage,
 					$isEncrypted,
+					false,
 				);
 			}
-			return new MessageStructureData($hasAttachments, $text, $isImipMessage, $isEncrypted);
+			return new MessageStructureData($hasAttachments, $text, $isImipMessage, $isEncrypted, false);
 		}, iterator_to_array($structures->getIterator()));
 	}
 	private function checkLinks(string $body, string $mailAddress) : bool {
+		if(strlen($body) === 0) {
+			return false;
+		}
 		$dom = new \DOMDocument();
 		libxml_use_internal_errors(true);
 		$dom->loadHTML($body);

diff --git a/lib/IMAP/MessageStructureData.php b/lib/IMAP/MessageStructureData.php
@@ -26,7 +26,7 @@ public function __construct(bool $hasAttachments,
 		string $previewText,
 		bool $isImipMessage,
 		bool $isEncrypted,
-		?bool $mentionsMe = false) {
+		bool $mentionsMe) {
 		$this->hasAttachments = $hasAttachments;
 		$this->previewText = $previewText;
 		$this->isImipMessage = $isImipMessage;