Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fixes #1152 CSN in MUC triggers rate limiting.

Browse Source 
- Avoid registering `sendChatState` twice as handler.
- Avoid sending out a CSN right after sending out a message
This commit is contained in:
JC Brand 2018-09-07 13:59:59 +02:00
parent 999536365d
commit 8cc88d9b17
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/converse.js vendored
View File

@ -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() {

8
src/converse-chatview.js
View File

@ -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) {

1
src/converse-muc-views.js
View File

@ -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'),

2
src/converse-muc.js
View File

@ -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 () {