fix: ensure drafts folder exists

Signed-off-by: Daniel Kesselberg <[email protected]>

Author: kesselb

lib/Db/LocalMessageMapper.php

@@ -164,11 +164,11 @@ public function findDueDrafts(int $time): array {
 			->where(
 				$qb->expr()->isNull('send_at'),
 				$qb->expr()->eq('type', $qb->createNamedParameter(LocalMessage::TYPE_DRAFT, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
-				$qb->expr()->lte('updated_at', $qb->createNamedParameter($time - 300, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
+				/*$qb->expr()->lte('updated_at', $qb->createNamedParameter($time - 300, IQueryBuilder::PARAM_INT), IQueryBuilder::PARAM_INT),
 				$qb->expr()->orX(
 					$qb->expr()->isNull('failed'),
 					$qb->expr()->eq('failed', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL), IQueryBuilder::PARAM_BOOL),
-				)
+				)*/
 			)
 			->orderBy('updated_at', 'asc')
 			->orderBy('account_id', 'asc');

lib/IMAP/FolderMapper.php

@@ -73,9 +73,10 @@ public function getFolders(Account $account, Horde_Imap_Client_Socket $client,
 		}, $toPersist);
 	}
 
-	public function createFolder(Horde_Imap_Client_Socket $client,
-		string $name): Folder {
-		$client->createMailbox($name);
+	public function createFolder(Horde_Imap_Client_Socket $client, string $name, array $specialUse = []): Folder {
+		$client->createMailbox($name, [
+			'special_use' => $specialUse,
+		]);
 
 		$list = $client->listMailboxes($name, Horde_Imap_Client::MBOX_ALL_SUBSCRIBED, [
 			'delimiter' => true,

lib/Service/MailManager.php

@@ -149,10 +149,10 @@ public function getMailboxes(Account $account): array {
 	 * @throws ServiceException
 	 */
 	#[\Override]
-	public function createMailbox(Account $account, string $name): Mailbox {
+	public function createMailbox(Account $account, string $name, array $specialUse = []): Mailbox {
 		$client = $this->imapClientFactory->getClient($account);
 		try {
-			$folder = $this->folderMapper->createFolder($client, $name);
+			$folder = $this->folderMapper->createFolder($client, $name, $specialUse);
 			$this->folderMapper->fetchFolderAcls([$folder], $client);
 		} catch (Horde_Imap_Client_Exception $e) {
 			throw new ServiceException(

lib/Service/MailTransmission.php

@@ -14,6 +14,7 @@
 use Horde_Imap_Client_Data_Fetch;
 use Horde_Imap_Client_Fetch_Query;
 use Horde_Imap_Client_Ids;
+use Horde_Imap_Client_Socket;
 use Horde_Mail_Transport_Null;
 use Horde_Mail_Transport_Smtphorde;
 use Horde_Mime_Exception;
@@ -28,6 +29,7 @@
 use OCA\Mail\Account;
 use OCA\Mail\Address;
 use OCA\Mail\AddressList;
+use OCA\Mail\Contracts\IMailManager;
 use OCA\Mail\Contracts\IMailTransmission;
 use OCA\Mail\Db\LocalMessage;
 use OCA\Mail\Db\Mailbox;
@@ -67,6 +69,7 @@ public function __construct(
 		private PerformanceLogger $performanceLogger,
 		private AliasesService $aliasesService,
 		private TransmissionService $transmissionService,
+		private IMailManager $mailManager
 	) {
 	}
 
@@ -231,6 +234,7 @@ public function saveLocalDraft(Account $account, LocalMessage $message): void {
 			$transport = new Horde_Mail_Transport_Null();
 			$mail->send($transport, false, false);
 			$perfLogger->step('create IMAP draft message');
+			$this->ensureDraftsMailbox($account);
 			// save the message in the drafts folder
 			$draftsMailboxId = $account->getMailAccount()->getDraftsMailboxId();
 			if ($draftsMailboxId === null) {
@@ -258,6 +262,19 @@ public function saveLocalDraft(Account $account, LocalMessage $message): void {
 		$perfLogger->end();
 	}
 
+	private function ensureDraftsMailbox(Account $account): void {
+		$mailAccount = $account->getMailAccount();
+		if ($mailAccount->getDraftsMailboxId() !== null) {
+			return;
+		}
+
+		$this->mailManager->createMailbox(
+			$account,
+			'Drafts',
+			[Horde_Imap_Client::SPECIALUSE_DRAFTS]
+		);
+	}
+
 	/**
 	 * @param NewMessageData $message
 	 * @param Message|null $previousDraft