fix(Snooze): some minor changes

Signed-off-by: Johannes Merkel <[email protected]>

lib/Controller/MessagesController.php

@@ -390,18 +390,25 @@ public function move(int $id, int $destFolderId): JSONResponse {
 	 *
 	 * @param int $id
 	 * @param int $unixTimestamp
+	 * @param int $destMailboxId
 	 *
 	 * @return JSONResponse
+	 * @throws ClientException
+	 * @throws ServiceException
 	 */
 	#[TrapError]
-	public function snooze(int $id, int $unixTimestamp): JSONResponse {
+	public function snooze(int $id, int $unixTimestamp, int $destMailboxId): JSONResponse {
 		try {
 			$message = $this->mailManager->getMessage($this->currentUserId, $id);
+			$srcMailbox = $this->mailManager->getMailbox($this->currentUserId, $message->getMailboxId());
+			$dstMailbox = $this->mailManager->getMailbox($this->currentUserId, $destMailboxId);
+			$srcAccount = $this->accountService->find($this->currentUserId, $srcMailbox->getAccountId());
+			$dstAccount = $this->accountService->find($this->currentUserId, $dstMailbox->getAccountId());
 		} catch (DoesNotExistException $e) {
 			return new JSONResponse([], Http::STATUS_FORBIDDEN);
 		}
 
-		$this->snoozeService->snoozeMessage($message, $unixTimestamp);
+		$this->snoozeService->snoozeMessage($message, $unixTimestamp, $srcAccount, $srcMailbox, $dstAccount, $dstMailbox);
 
 		return new JSONResponse();
 	}

lib/Controller/ThreadController.php

@@ -104,18 +104,25 @@ public function move(int $id, int $destMailboxId): JSONResponse {
 	 *
 	 * @param int $id
 	 * @param int $unixTimestamp
+	 * @param int $destMailboxId
 	 *
 	 * @return JSONResponse
+	 * @throws ClientException
+	 * @throws ServiceException
 	 */
 	#[TrapError]
-	public function snooze(int $id, int $unixTimestamp): JSONResponse {
+	public function snooze(int $id, int $unixTimestamp, int $destMailboxId): JSONResponse {
 		try {
 			$selectedMessage = $this->mailManager->getMessage($this->currentUserId, $id);
+			$srcMailbox = $this->mailManager->getMailbox($this->currentUserId, $selectedMessage->getMailboxId());
+			$srcAccount = $this->accountService->find($this->currentUserId, $srcMailbox->getAccountId());
+			$dstMailbox = $this->mailManager->getMailbox($this->currentUserId, $destMailboxId);
+			$dstAccount = $this->accountService->find($this->currentUserId, $dstMailbox->getAccountId());
 		} catch (DoesNotExistException $e) {
 			return new JSONResponse([], Http::STATUS_FORBIDDEN);
 		}
 
-		$this->snoozeService->snoozeThread($selectedMessage, $unixTimestamp);
+		$this->snoozeService->snoozeThread($selectedMessage, $unixTimestamp, $srcAccount, $srcMailbox, $dstAccount, $dstMailbox);
 
 		return new JSONResponse();
 	}

lib/Service/SnoozeService.php

@@ -29,6 +29,7 @@
 use OCA\Mail\Account;
 use OCA\Mail\Contracts\IMailManager;
 use OCA\Mail\Db\MailAccountMapper;
+use OCA\Mail\Db\Mailbox;
 use OCA\Mail\Db\MailboxMapper;
 use OCA\Mail\Db\Message;
 use OCA\Mail\Db\MessageMapper;
@@ -40,6 +41,7 @@
 use OCA\Mail\IMAP\IMAPClientFactory;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\DB\Exception;
 use Psr\Log\LoggerInterface;
 
 class SnoozeService {
@@ -81,6 +83,79 @@ public function wakeMessages(): void {
 		}
 	}
 
+	/**
+	 * @param Message $message
+	 * @param int $unixTimestamp
+	 * @param Account $srcAccount
+	 * @param Mailbox $srcMailbox
+	 * @param Account $dstAccount
+	 * @param Mailbox $dstMailbox
+	 *
+	 * @return void
+	 *
+	 * @throws ServiceException
+	 */
+	public function snoozeMessage(
+		Message $message,
+		int $unixTimestamp,
+		Account $srcAccount,
+		Mailbox $srcMailbox,
+		Account $dstAccount,
+		Mailbox $dstMailbox
+	): void {
+		$this->snoozeMessageDB($message, $unixTimestamp);
+
+		try {
+			$this->mailManager->moveMessage(
+				$srcAccount,
+				$srcMailbox->getName(),
+				$message->getUid(),
+				$dstAccount,
+				$dstMailbox->getName()
+			);
+		} catch (\Throwable $e) {
+			$this->unSnoozeMessageDB($message);
+			throw new ServiceException($e->getMessage());
+		}
+	}
+
+	/**
+	 * @param Message $selectedMessage
+	 * @param int $unixTimestamp
+	 * @param Account $srcAccount
+	 * @param Mailbox $srcMailbox
+	 * @param Account $dstAccount
+	 * @param Mailbox $dstMailbox
+	 *
+	 * @return void
+	 *
+	 * @throws ServiceException
+	 */
+	public function snoozeThread(
+		Message $selectedMessage,
+		int $unixTimestamp,
+		Account $srcAccount,
+		Mailbox $srcMailbox,
+		Account $dstAccount,
+		Mailbox $dstMailbox
+	):void {
+		$this->snoozeThreadDB($selectedMessage, $unixTimestamp);
+
+		try {
+			$this->mailManager->moveThread(
+				$srcAccount,
+				$srcMailbox,
+				$dstAccount,
+				$dstMailbox,
+				$selectedMessage->getThreadRootId()
+			);
+		} catch (\Throwable $e) {
+			$this->unSnoozeThreadDB($selectedMessage);
+			throw new ServiceException($e->getMessage());
+		}
+
+	}
+
 
 	/**
 	 * Adds a DB entry for the message with a wake timestamp
@@ -89,11 +164,26 @@ public function wakeMessages(): void {
 	 * @param int $unixTimestamp
 	 * @return void
 	 */
-	public function snoozeMessage(Message $message, int $unixTimestamp): void {
+	public function snoozeMessageDB(Message $message, int $unixTimestamp): void {
 		$snooze = new MessageSnooze();
 		$snooze->setMessageId($message->getMessageId());
 		$snooze->setSnoozedUntil($unixTimestamp);
-		$this->messageSnoozeMapper->insert($snooze);
+		try {
+			$this->messageSnoozeMapper->insert($snooze);
+		} catch(Exception $e) {
+			$this->messageSnoozeMapper->deleteByMessageId($message->getMessageId());
+			$this->messageSnoozeMapper->insert($snooze);
+		}
+	}
+
+	/**
+	 * Removes the DB entry for the message
+	 *
+	 * @param Message $message
+	 * @return void
+	 */
+	public function unSnoozeMessageDB(Message $message): void {
+		$this->messageSnoozeMapper->deleteByMessageId($message->getMessageId());
 	}
 
 	/**
@@ -103,7 +193,7 @@ public function snoozeMessage(Message $message, int $unixTimestamp): void {
 	 * @param int $unixTimestamp
 	 * @return void
 	 */
-	public function snoozeThread(Message $selectedMessage, int $unixTimestamp): void {
+	public function snoozeThreadDB(Message $selectedMessage, int $unixTimestamp): void {
 		$messages = $this->threadMapper->findMessageIdsByThreadRoot(
 			$selectedMessage->getThreadRootId()
 		);
@@ -112,7 +202,28 @@ public function snoozeThread(Message $selectedMessage, int $unixTimestamp): void
 			$snooze = new MessageSnooze();
 			$snooze->setMessageId($message['messageId']);
 			$snooze->setSnoozedUntil($unixTimestamp);
-			$this->messageSnoozeMapper->insert($snooze);
+			try {
+				$this->messageSnoozeMapper->insert($snooze);
+			} catch(Exception $e) {
+				$this->messageSnoozeMapper->deleteByMessageId($message['messageId']);
+				$this->messageSnoozeMapper->insert($snooze);
+			}
+		}
+	}
+
+	/**
+	 * Removes DB entry for the messages
+	 *
+	 * @param Message $selectedMessage
+	 * @return void
+	 */
+	public function unSnoozeThreadDB(Message $selectedMessage): void {
+		$messages = $this->threadMapper->findMessageIdsByThreadRoot(
+			$selectedMessage->getThreadRootId()
+		);
+
+		foreach ($messages as $message) {
+			$this->messageSnoozeMapper->deleteByMessageId($message['messageId']);
 		}
 	}
 

src/components/Envelope.vue

@@ -17,7 +17,7 @@
 		:details="formatted()"
 		@click="onClick"
 		@click.ctrl="toggleSelected"
-		@update:menuOpen="moreActionsOpen=false">
+		@update:menuOpen="closeMoreAndSnoozeOptions">
 		<template #icon>
 			<Star
 				v-if="data.flags.flagged"
@@ -621,21 +621,23 @@ export default {
 		reminderOptions() {
 			const currentDateTime = moment()
 
-			// Same day 18:00 PM (or hidden)
-			const laterTodayTime = (currentDateTime.hour() < 18)
+			// Same day 18:00 PM (hidden if after 17:00 PM now)
+			const laterTodayTime = (currentDateTime.hour() < 17)
 				? moment().hour(18)
 				: null
 
 			// Tomorrow 08:00 AM
 			const tomorrowTime = moment().add(1, 'days').hour(8)
 
-			// Saturday 08:00 AM (or hidden)
-			const thisWeekendTime = (currentDateTime.day() !== 6 && currentDateTime.day() !== 0)
+			// Saturday 08:00 AM (hidden if Friday, Saturday or Sunday now)
+			const thisWeekendTime = (currentDateTime.day() > 0 && currentDateTime.day() < 5)
 				? moment().day(6).hour(8)
 				: null
 
-			// Next Monday 08:00 AM
-			const nextWeekTime = moment().add(1, 'weeks').day(1).hour(8)
+			// Next Monday 08:00 AM (hidden if Sunday now)
+			const nextWeekTime = (currentDateTime.day() !== 0)
+				? moment().add(1, 'weeks').day(1).hour(8)
+				: null
 
 			return [
 				{
@@ -760,6 +762,10 @@ export default {
 			this.snoozeOptions = true
 			this.moreActionsOpen = false
 		},
+		closeMoreAndSnoozeOptions() {
+			this.snoozeOptions = false
+			this.moreActionsOpen = false
+		},
 		async onArchive() {
 			// Remove from selection first
 			this.setSelected(false)
@@ -784,9 +790,6 @@ export default {
 				await this.$store.dispatch('snoozeThread', {
 					envelope: this.data,
 					unixTimestamp: timestamp / 1000,
-				})
-				await this.$store.dispatch('moveThread', {
-					envelope: this.data,
 					destMailboxId: this.account.snoozeMailboxId,
 				})
 				showSuccess(t('mail', 'Thread was snoozed'))

src/components/MenuEnvelope.vue

@@ -494,14 +494,9 @@ export default {
 			logger.info(`snoozing message ${this.envelope.databaseId}`)
 
 			try {
-				// Adds DB entry
 				await this.$store.dispatch('snoozeMessage', {
 					id: this.envelope.databaseId,
 					unixTimestamp: timestamp / 1000,
-				})
-				// Moves message
-				await this.$store.dispatch('moveMessage', {
-					id: this.envelope.databaseId,
 					destMailboxId: this.account.snoozeMailboxId,
 				})
 				showSuccess(t('mail', 'Message was snoozed'))

src/components/NavigationMailbox.vue

@@ -58,7 +58,7 @@
 					:size="20" />
 				<IconJunk v-else-if="mailbox.databaseId === account.junkMailboxId"
 					:size="20" />
-				<AlarmIcon v-else-if="mailbox.name === 'Snoozed'"
+				<AlarmIcon v-else-if="mailbox.databaseId === account.snoozeMailboxId"
 					:size="20" />
 				<IconFolderShared v-else-if="mailbox.shared"
 					:size="20" />

src/service/MessageService.js

@@ -239,14 +239,14 @@ export function moveMessage(id, destFolderId) {
 	})
 }
 
-// Only adds DB entry, moving the message is done in a separate request
-export function snoozeMessage(id, unixTimestamp) {
+export function snoozeMessage(id, unixTimestamp, destMailboxId) {
 	const url = generateUrl('/apps/mail/api/messages/{id}/snooze', {
 		id,
 	})
 
 	return axios.post(url, {
 		unixTimestamp,
+		destMailboxId,
 	})
 }
 

src/service/ThreadService.js

@@ -26,14 +26,13 @@ export async function moveThread(id, destMailboxId) {
 	}
 }
 
-// Only adds DB entry, moving the messages is done in a separate request
-export async function snoozeThread(id, unixTimestamp) {
+export async function snoozeThread(id, unixTimestamp, destMailboxId) {
 	const url = generateUrl('/apps/mail/api/thread/{id}/snooze', {
 		id,
 	})
 
 	try {
-		return await axios.post(url, { unixTimestamp })
+		return await axios.post(url, { unixTimestamp, destMailboxId })
 	} catch (e) {
 		throw convertAxiosError(e)
 	}

src/store/actions.js

@@ -1186,10 +1186,11 @@ export default {
 			commit('removeMessage', { id })
 		})
 	},
-	// Only adds DB entry, moving the message is done in a separate request
-	async snoozeMessage({ commit }, { id, unixTimestamp }) {
+	async snoozeMessage({ commit }, { id, unixTimestamp, destMailboxId }) {
 		return handleHttpAuthErrors(commit, async () => {
-			await snoozeMessage(id, unixTimestamp)
+			await snoozeMessage(id, unixTimestamp, destMailboxId)
+			commit('removeEnvelope', { id })
+			commit('removeMessage', { id })
 		})
 	},
 	async fetchActiveSieveScript({ commit }, { accountId }) {
@@ -1281,10 +1282,17 @@ export default {
 			}
 		})
 	},
-	// Only adds DB entry, moving the messages is done in a separate request
-	async snoozeThread({ getters, commit }, { envelope, unixTimestamp }) {
+	async snoozeThread({ getters, commit }, { envelope, unixTimestamp, destMailboxId }) {
 		return handleHttpAuthErrors(commit, async () => {
-			await ThreadService.snoozeThread(envelope.databaseId, unixTimestamp)
+			try {
+				await ThreadService.snoozeThread(envelope.databaseId, unixTimestamp, destMailboxId)
+				console.debug('thread snoozed')
+			} catch (e) {
+				commit('addEnvelope', envelope)
+				console.error('could not snooze thread', e)
+				throw e
+			}
+			commit('removeEnvelope', { id: envelope.databaseId })
 		})
 	},