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

@@ -83,8 +83,10 @@ class Message extends Entity implements JsonSerializable {
 		'seen',
 		'forwarded',
 		'$junk',
+		'junk',
 		'$notjunk',
-		'mdnsent',
+		'notjunk',
+		'$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
 	];
@@ -282,10 +284,12 @@ public function setFlag(string $flag, bool $value = true) {
 		}
 		if ($flag === Tag::LABEL_IMPORTANT) {
 			$this->setFlagImportant($value);
-		} elseif ($flag === '$junk') {
+		} elseif ($flag === '$junk' || $flag === 'junk') {
 			$this->setFlagJunk($value);
-		} elseif ($flag === '$notjunk') {
+		} elseif ($flag === '$notjunk' || $flag === 'notjunk') {
 			$this->setFlagNotjunk($value);
+		} elseif ($flag === '$mdnsent') {
+			$this->setFlagMdnsent($value);
 		} else {
 			$this->setter(
 				$this->columnToProperty("flag_$flag"),
@@ -338,7 +342,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

@@ -162,7 +162,7 @@ public function getFlags(): array {
 			'draft' => in_array(Horde_Imap_Client::FLAG_DRAFT, $this->flags),
 			'forwarded' => in_array(Horde_Imap_Client::FLAG_FORWARDED, $this->flags),
 			'hasAttachments' => $this->hasAttachments,
-			'mdnsent' => in_array(Horde_Imap_Client::FLAG_MDNSENT, $this->flags, true),
+			'$mdnsent' => in_array(Horde_Imap_Client::FLAG_MDNSENT, $this->flags, true),
 			'important' => in_array(Tag::LABEL_IMPORTANT, $this->flags, true)
 		];
 	}
@@ -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,

src/components/MdnRequest.vue

@@ -51,7 +51,7 @@ export default {
 	computed: {
 		...mapStores(useMainStore),
 		mdnSent() {
-			return this.message.flags.mdnsent
+			return this.message.flags.$mdnsent
 		},
 	},
 
@@ -62,7 +62,7 @@ export default {
 
 			try {
 				await sendMdn(this.message.databaseId)
-				this.mainStore.flagEnvelopeMutation({ envelope: this.message, flag: 'mdnsent', value: true })
+				this.mainStore.flagEnvelopeMutation({ envelope: this.message, flag: '$mdnsent', value: true })
 			} catch (error) {
 				logger.error('could not send mdn', error)
 				showError(t('mail', 'Could not send mdn'))