fix: Fix incorrect flag for MDN sent and hide junk flag used by Thunderbird

Signed-off-by: David Dreschner <[email protected]>

Author: DerDreschner

lib/Controller/MessagesController.php

@@ -472,7 +472,7 @@ public function mdn(int $id): JSONResponse {
 
 		try {
 			$this->mailTransmission->sendMdn($account, $mailbox, $message);
-			$this->mailManager->flagMessage($account, $mailbox->getName(), $message->getUid(), 'mdnsent', true);
+			$this->mailManager->flagMessage($account, $mailbox->getName(), $message->getUid(), '$mdnsent', true);
 		} catch (ServiceException $ex) {
 			$this->logger->error('Sending mdn failed: ' . $ex->getMessage());
 			throw $ex;

lib/Db/Message.php

@@ -84,7 +84,7 @@ class Message extends Entity implements JsonSerializable {
 		'forwarded',
 		'$junk',
 		'$notjunk',
-		'mdnsent',
+		'$mdnsent',
 		Tag::LABEL_IMPORTANT,
 		'$important' // @todo remove this when we have removed all references on IMAP to $important @link https://github.com/nextcloud/mail/issues/25
 	];
@@ -338,7 +338,7 @@ public function jsonSerialize() {
 				'important' => ($this->getFlagImportant() === true),
 				'$junk' => ($this->getFlagJunk() === true),
 				'$notjunk' => ($this->getFlagNotjunk() === true),
-				'mdnsent' => ($this->getFlagMdnsent() === true),
+				'$mdnsent' => ($this->getFlagMdnsent() === true),
 			],
 			'tags' => $indexed,
 			'from' => $this->getFrom()->jsonSerialize(),

lib/Model/IMAPMessage.php

@@ -535,7 +535,7 @@ public function toDbMessage(int $mailboxId, MailAccount $account): Message {
 		$msg->setFlagJunk(
 			in_array(Horde_Imap_Client::FLAG_JUNK, $flags, true)
 			|| in_array('junk', $flags, true)
-		);
+		); // While this is not a standard IMAP flag, Thunderbird uses it to mark "junk"
 		$msg->setFlagNotjunk(in_array(Horde_Imap_Client::FLAG_NOTJUNK, $flags, true) || in_array('nonjunk', $flags, true));// While this is not a standard IMAP Flag, Thunderbird uses it to mark "not junk"
 		// @todo remove this as soon as possible @link https://github.com/nextcloud/mail/issues/25
 		$msg->setFlagImportant(in_array('$important', $flags, true) || in_array('$labelimportant', $flags, true) || in_array(Tag::LABEL_IMPORTANT, $flags, true));
@@ -552,6 +552,7 @@ public function toDbMessage(int $mailboxId, MailAccount $account): Message {
 			Horde_Imap_Client::FLAG_DELETED,
 			Horde_Imap_Client::FLAG_DRAFT,
 			Horde_Imap_Client::FLAG_JUNK,
+			'junk', // While this is not a standard IMAP flag, Thunderbird uses it to mark "junk"
 			Horde_Imap_Client::FLAG_NOTJUNK,
 			'nonjunk', // While this is not a standard IMAP Flag, Thunderbird uses it to mark "not junk"
 			Horde_Imap_Client::FLAG_MDNSENT,