Merge pull request #6233 from nextcloud/fix/fix-undo-with-scheduled-m…

…essage Fix sending message workflow
nextcloud · Apr 14, 2022 · 1fa3a56 · 1fa3a56
2 parents 8088a1f + 1d35e0e
commit 1fa3a56
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/components/NewMessageModal.vue b/src/components/NewMessageModal.vue
@@ -117,10 +117,10 @@ export default {
 				attachments: data.attachments,
 				aliasId: data.aliasId,
 				inReplyToMessageId: null,
-				sendAt: data.sendAt ? data.sendAt : Math.floor(now / 1000),
+				sendAt: data.sendAt ? data.sendAt : Math.floor((now + UNDO_DELAY) / 1000),
 			}
-			if (dataForServer.sendAt < Math.floor(now / 1000)) {
-				dataForServer.sendAt = Math.floor(now / 1000)
+			if (dataForServer.sendAt < Math.floor((now + UNDO_DELAY) / 1000)) {
+				dataForServer.sendAt = Math.floor((now + UNDO_DELAY) / 1000)
 			}
 
 			let message
@@ -135,7 +135,7 @@ export default {
 				})
 			}
 
-			if (!data.sendAt) {
+			if (!data.sendAt || data.sendAt < Math.floor((now + UNDO_DELAY) / 1000)) {
 				showUndo(
 					t('mail', 'Message sent'),
 					async() => {