From 9d0f80cea7365fb27303b3b46fa189c05e530cce Mon Sep 17 00:00:00 2001 From: SebastianKrupinski Date: Tue, 27 Aug 2024 14:10:18 -0400 Subject: [PATCH] Alter Outbox logic to handle automated messages better Signed-off-by: SebastianKrupinski --- lib/Controller/OutboxController.php | 2 +- src/components/OutboxMessageListItem.vue | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Controller/OutboxController.php b/lib/Controller/OutboxController.php index 2429a3589f..e12ee31eaf 100644 --- a/lib/Controller/OutboxController.php +++ b/lib/Controller/OutboxController.php @@ -180,7 +180,7 @@ public function update( int $accountId, string $subject, string $body, - string $editorBody, + ?string $editorBody, bool $isHtml, bool $smimeSign, bool $smimeEncrypt, diff --git a/src/components/OutboxMessageListItem.vue b/src/components/OutboxMessageListItem.vue index f9a5b62e38..e58c39eee0 100644 --- a/src/components/OutboxMessageListItem.vue +++ b/src/components/OutboxMessageListItem.vue @@ -163,12 +163,16 @@ export default { if (error.data !== undefined) { await this.outboxStore.updateMessage({ message: error.data[0], id: message.id }) } + } }, async openModal() { if (this.message.status === STATUS_IMAP_SENT_MAILBOX_FAIL) { return } + if (this.message.editorBody === null) { + return + } await this.$store.dispatch('startComposerSession', { type: 'outbox', data: {