From 8cc88d9b17c281e317cf7cbfcdb12df1692c1fe8 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 7 Sep 2018 13:59:59 +0200
Subject: [PATCH] Fixes #1152 CSN in MUC triggers rate limiting.

- Avoid registering `sendChatState` twice as handler.
- Avoid sending out a CSN right after sending out a message
---
 dist/converse.js          | 14 +++++++++-----
 src/converse-chatview.js  |  8 +++++---
 src/converse-muc-views.js |  1 +
 src/converse-muc.js       |  2 --
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/dist/converse.js b/dist/converse.js
index a2cb74826..0f832abea 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -61587,7 +61587,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           this.model.sendMessage(attrs);
         },
 
-        setChatState(state) {
+        setChatState(state, options) {
           /* Mutator for setting the chat state of this chat session.
            * Handles clearing of any chat state notification timeouts and
            * setting new ones if necessary.
@@ -61609,7 +61609,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
             this.chat_state_timeout = window.setTimeout(this.setChatState.bind(this), _converse.TIMEOUTS.INACTIVE, _converse.INACTIVE);
           }
 
-          this.model.set('chat_state', state);
+          this.model.set('chat_state', state, options);
           return this;
         },
 
@@ -61639,9 +61639,13 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           textarea.dispatchEvent(event);
           this.onMessageSubmitted(message, spoiler_hint);
 
-          _converse.emit('messageSend', message);
+          _converse.emit('messageSend', message); // Suppress events, otherwise superfluous CSN gets set
+          // immediately after the message, causing rate-limiting issues.
 
-          this.setChatState(_converse.ACTIVE);
+
+          this.setChatState(_converse.ACTIVE, {
+            'silent': true
+          });
         },
 
         keyPressed(ev) {
@@ -68780,6 +68784,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
             case 'topic':
             case 'subject':
+              // TODO: should be done via API call to _converse.api.rooms
               _converse.connection.send($msg({
                 to: this.model.get('jid'),
                 from: _converse.connection.jid,
@@ -70089,7 +70094,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
           this.occupants.browserStorage = new Backbone.BrowserStorage.session(b64_sha1(`converse.occupants-${_converse.bare_jid}${this.get('jid')}`));
           this.occupants.chatroom = this;
           this.registerHandlers();
-          this.on('change:chat_state', this.sendChatState, this);
         },
 
         registerHandlers() {
diff --git a/src/converse-chatview.js b/src/converse-chatview.js
index 3f2a1964d..497994909 100644
--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -823,7 +823,7 @@
                     this.model.sendMessage(attrs);
                 },
 
-                setChatState (state) {
+                setChatState (state, options) {
                     /* Mutator for setting the chat state of this chat session.
                      * Handles clearing of any chat state notification timeouts and
                      * setting new ones if necessary.
@@ -851,7 +851,7 @@
                             _converse.INACTIVE
                         );
                     }
-                    this.model.set('chat_state', state);
+                    this.model.set('chat_state', state, options);
                     return this;
                 },
 
@@ -879,7 +879,9 @@
 
                     this.onMessageSubmitted(message, spoiler_hint);
                     _converse.emit('messageSend', message);
-                    this.setChatState(_converse.ACTIVE);
+                    // Suppress events, otherwise superfluous CSN gets set
+                    // immediately after the message, causing rate-limiting issues.
+                    this.setChatState(_converse.ACTIVE, {'silent': true});
                 },
 
                 keyPressed (ev) {
diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index af93572c9..27f1139d9 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -1011,6 +1011,7 @@
                             break;
                         case 'topic':
                         case 'subject':
+                            // TODO: should be done via API call to _converse.api.rooms
                             _converse.connection.send(
                                 $msg({
                                     to: this.model.get('jid'),
diff --git a/src/converse-muc.js b/src/converse-muc.js
index 86ccf9277..748b48c82 100644
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -189,9 +189,7 @@
                         b64_sha1(`converse.occupants-${_converse.bare_jid}${this.get('jid')}`)
                     );
                     this.occupants.chatroom  = this;
-
                     this.registerHandlers();
-                    this.on('change:chat_state', this.sendChatState, this);
                 },
 
                 registerHandlers () {