From 267d91a4f3a30b7915cbdd7f7505bf0d085a860d Mon Sep 17 00:00:00 2001 From: Christoph Scholz Date: Tue, 20 Nov 2018 17:19:55 +0100 Subject: [PATCH] don't send receipt requests in MUCs --- CHANGES.md | 1 + dist/converse.js | 8 ++++++-- spec/http-file-upload.js | 1 - spec/messages.js | 4 ---- src/headless/converse-chatboxes.js | 7 ++++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 16b08142e..f7f7c0d9e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ - Don't render http (i.e. non-TLS) resources - #1331 Fix missing checkmarks in old muc messages +- #1333 Don't send receipt requests in MUCs ## 4.0.5 (2018-11-15) diff --git a/dist/converse.js b/dist/converse.js index 26627ee65..7a927d964 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -61677,10 +61677,14 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha 'id': message.get('edited') && _converse.connection.getUniqueId() || message.get('msgid') }).c('body').t(message.get('message')).up().c(_converse.ACTIVE, { 'xmlns': Strophe.NS.CHATSTATES - }).up().c('request', { - 'xmlns': Strophe.NS.RECEIPTS }).up(); + if (message.get('type') === 'chat') { + stanza.c('request', { + 'xmlns': Strophe.NS.RECEIPTS + }).up(); + } + if (message.get('is_spoiler')) { if (message.get('spoiler_hint')) { stanza.c('spoiler', { diff --git a/spec/http-file-upload.js b/spec/http-file-upload.js index 9d6f4f293..969423ed0 100644 --- a/spec/http-file-upload.js +++ b/spec/http-file-upload.js @@ -461,7 +461,6 @@ `xmlns="jabber:client">`+ `${message}`+ ``+ - ``+ ``+ `${message}`+ ``+ diff --git a/spec/messages.js b/spec/messages.js index 19471cd7b..4543c8588 100644 --- a/spec/messages.js +++ b/spec/messages.js @@ -2125,7 +2125,6 @@ `xmlns="jabber:client">`+ `But soft, what light through yonder window breaks?`+ ``+ - ``+ ``+ ``); @@ -2348,7 +2347,6 @@ `xmlns="jabber:client">`+ `hello z3r0 gibson mr.robot, how are you?`+ ``+ - ``+ ``+ ``+ ``+ @@ -2374,7 +2372,6 @@ `xmlns="jabber:client">`+ `hello z3r0 gibson sw0rdf1sh, how are you?`+ ``+ - ``+ ``+ ``+ ``+ @@ -2423,7 +2420,6 @@ `xmlns="jabber:client">`+ `hello z3r0 gibson mr.robot, how are you?`+ ``+ - ``+ ``+ ``+ ``+ diff --git a/src/headless/converse-chatboxes.js b/src/headless/converse-chatboxes.js index 567b9429e..2d0889a56 100644 --- a/src/headless/converse-chatboxes.js +++ b/src/headless/converse-chatboxes.js @@ -329,9 +329,10 @@ converse.plugins.add('converse-chatboxes', { 'type': this.get('message_type'), 'id': message.get('edited') && _converse.connection.getUniqueId() || message.get('msgid'), }).c('body').t(message.get('message')).up() - .c(_converse.ACTIVE, {'xmlns': Strophe.NS.CHATSTATES}).up() - .c('request', {'xmlns': Strophe.NS.RECEIPTS}).up(); - + .c(_converse.ACTIVE, {'xmlns': Strophe.NS.CHATSTATES}).up(); + if (message.get('type') === 'chat') { + stanza.c('request', {'xmlns': Strophe.NS.RECEIPTS}).up(); + } if (message.get('is_spoiler')) { if (message.get('spoiler_hint')) { stanza.c('spoiler', {'xmlns': Strophe.NS.SPOILER}, message.get('spoiler_hint')).up();