[FIX] double send bug on message box (#15409)

RocketChat · Sep 19, 2019 · 04a0acd · 04a0acd
1 parent fa78ecd
commit 04a0acd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app/ui-message/client/messageBox/messageBox.js b/app/ui-message/client/messageBox/messageBox.js
@@ -83,6 +83,8 @@ Template.messageBox.onCreated(function() {
 		autogrow.update();
 	};
 
+	let isSending = false;
+
 	this.send = (event) => {
 		const { input } = this;
 
@@ -93,9 +95,16 @@ Template.messageBox.onCreated(function() {
 		const { autogrow, data: { rid, tmid, onSend } } = this;
 		const { value } = input;
 		this.set('');
-		onSend && onSend.call(this.data, event, { rid, tmid, value }, () => {
+
+		if (!onSend || isSending) {
+			return;
+		}
+
+		isSending = true;
+		onSend.call(this.data, event, { rid, tmid, value }, () => {
 			autogrow.update();
 			input.focus();
+			isSending = false;
 		});
 	};
 });

diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
@@ -298,10 +298,13 @@ export class ChatMessages {
 
 				this.resetToDraft(this.editing.id);
 				this.confirmDeleteMsg(message, done);
+				return;
 			} catch (error) {
 				handleError(error);
 			}
 		}
+
+		return done();
 	}
 
 	async processMessageSend(message) {