From f7121fa529ebe516e19906e0a0ac41ee9adc500d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Sun, 9 Oct 2022 21:51:25 -0400
Subject: [PATCH] breaking: move action:chat.sent to success callback of api
 call

dont fire action:chat.sent on chat message edit, fire action:chat.edited instead
---
 public/src/client/chats/messages.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js
index 77be135621..b93902e829 100644
--- a/public/src/client/chats/messages.js
+++ b/public/src/client/chats/messages.js
@@ -19,12 +19,12 @@ define('forum/chats/messages', [
 		inputEl.removeAttr('data-mid');
 		messages.updateRemainingLength(inputEl.parent());
 		const payload = { roomId, message, mid };
-		// TODO: move this to success callback of api.post/put call?
-		hooks.fire('action:chat.sent', payload);
 		({ roomId, message, mid } = await hooks.fire('filter:chat.send', payload));
 
 		if (!mid) {
-			api.post(`/chats/${roomId}`, { message }).catch((err) => {
+			api.post(`/chats/${roomId}`, { message }).then(() => {
+				hooks.fire('action:chat.sent', { roomId, message, mid });
+			}).catch((err) => {
 				inputEl.val(message);
 				messages.updateRemainingLength(inputEl.parent());
 				if (err.message === '[[error:email-not-confirmed-chat]]') {
@@ -40,7 +40,9 @@ define('forum/chats/messages', [
 				});
 			});
 		} else {
-			api.put(`/chats/${roomId}/messages/${mid}`, { message }).catch((err) => {
+			api.put(`/chats/${roomId}/messages/${mid}`, { message }).then(() => {
+				hooks.fire('action:chat.edited', { roomId, message, mid });
+			}).catch((err) => {
 				inputEl.val(message);
 				inputEl.attr('data-mid', mid);
 				messages.updateRemainingLength(inputEl.parent());