From 24e57244d194b360aff3e311dfc3959c84dee987 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 8 Apr 2021 10:00:05 +0200
Subject: [PATCH] Remove the `messageSend` event

---
 CHANGES.md                           | 1 +
 spec/chatbox.js                      | 3 +--
 spec/messages.js                     | 1 -
 spec/muc.js                          | 2 +-
 src/plugins/chatview/bottom-panel.js | 9 ---------
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8cf28af8c..bf7e9a721 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -33,6 +33,7 @@ Removed events:
 * `chatBoxInsertedIntoDOM`
 * `bookmarkViewsInitialized`
 * `rosterGroupsFetched`
+* `messageSend` (use `sendMessage` instead)
 
 The `chatBoxMaximized` and `chatBoxMinimized` events now have the `model` as
 payload and not the `view` since it might not be exist at that time.
diff --git a/spec/chatbox.js b/spec/chatbox.js
index 8baaed058..b6d3c6bbd 100644
--- a/spec/chatbox.js
+++ b/spec/chatbox.js
@@ -940,8 +940,7 @@ describe("Chatboxes", function () {
             });
             expect(window.confirm).toHaveBeenCalledWith('Are you sure you want to clear the messages from this conversation?');
             await u.waitUntil(() => view.model.messages.length === 0);
-            expect(_converse.api.trigger.calls.count(), 1);
-            expect(_converse.api.trigger.calls.mostRecent().args, ['messageSend', message]);
+            await u.waitUntil(() => !view.querySelectorAll('.chat-msg__body').length);
             done();
         }));
     });
diff --git a/spec/messages.js b/spec/messages.js
index c3a9974fa..37cafc105 100644
--- a/spec/messages.js
+++ b/spec/messages.js
@@ -936,7 +936,6 @@ describe("A Chat Message", function () {
             await mock.sendMessage(view, message);
             expect(view.model.sendMessage).toHaveBeenCalled();
             expect(view.model.messages.length, 2);
-            expect(_converse.api.trigger.calls.mostRecent().args, ['messageSend', message]);
             expect(sizzle('.chat-content .chat-msg:last .chat-msg__text', view).pop().textContent).toEqual(message);
             done();
         }));
diff --git a/spec/muc.js b/spec/muc.js
index ad3fd6187..bfa0e00a0 100644
--- a/spec/muc.js
+++ b/spec/muc.js
@@ -1903,7 +1903,7 @@ describe("Groupchats", function () {
             });
             await u.waitUntil(() => view.querySelectorAll('.chat-msg__text').length);
 
-            expect(_converse.api.trigger).toHaveBeenCalledWith('messageSend', jasmine.any(_converse.Message));
+            expect(_converse.api.trigger).toHaveBeenCalledWith('sendMessage', jasmine.any(Object));
             expect(view.querySelectorAll('.chat-msg').length).toBe(1);
 
             // Let's check that if we receive the same message again, it's
diff --git a/src/plugins/chatview/bottom-panel.js b/src/plugins/chatview/bottom-panel.js
index 7c8b39356..39ad4f224 100644
--- a/src/plugins/chatview/bottom-panel.js
+++ b/src/plugins/chatview/bottom-panel.js
@@ -186,15 +186,6 @@ export default class ChatBottomPanel extends ElementView {
             textarea.style.height = 'auto';
             this.updateCharCounter(textarea.value);
         }
-        if (message) {
-            /**
-             * Triggered whenever a message is sent by the user
-             * @event _converse#messageSend
-             * @type { _converse.Message }
-             * @example _converse.api.listen.on('messageSend', message => { ... });
-             */
-            api.trigger('messageSend', message);
-        }
         if (api.settings.get('view_mode') === 'overlayed') {
             // XXX: Chrome flexbug workaround. The .chat-content area
             // doesn't resize when the textarea is resized to its original size.