don't send receipt requests in MUCs

267d91a4 · Christoph Scholz · JC Brand · d341c6a1 · 267d91a4 · 267d91a4
Commit 267d91a4 authored Nov 20, 2018 by Christoph Scholz Committed by JC Brand Nov 20, 2018
5 changed files
--- 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)


--- a/dist/converse.js
+++ b/dist/converse.js
@@ -61677,9 +61677,13 @@ _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', {
+        }).up();
+
+        if (message.get('type') === 'chat') {
+          stanza.c('request', {
            'xmlns': Strophe.NS.RECEIPTS
          }).up();
+        }

        if (message.get('is_spoiler')) {
          if (message.get('spoiler_hint')) {
--- a/spec/http-file-upload.js
+++ b/spec/http-file-upload.js
@@ -461,7 +461,6 @@
                                `xmlns="jabber:client">`+
                                    `<body>${message}</body>`+
                                    `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
-                                    `<request xmlns="urn:xmpp:receipts"/>`+
                                    `<x xmlns="jabber:x:oob">`+
                                        `<url>${message}</url>`+
                                    `</x>`+

--- a/spec/messages.js
+++ b/spec/messages.js
@@ -2125,7 +2125,6 @@
                    `xmlns="jabber:client">`+
                        `<body>But soft, what light through yonder window breaks?</body>`+
                        `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
-                        `<request xmlns="urn:xmpp:receipts"/>`+
                        `<replace id="${first_msg.get("msgid")}" xmlns="urn:xmpp:message-correct:0"/>`+
                `</message>`);

@@ -2348,7 +2347,6 @@
                            `xmlns="jabber:client">`+
                                `<body>hello z3r0 gibson mr.robot, how are you?</body>`+
                                `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
-                                `<request xmlns="urn:xmpp:receipts"/>`+
                                `<reference begin="18" end="26" type="mention" uri="xmpp:mr.robot@localhost" xmlns="urn:xmpp:reference:0"/>`+
                                `<reference begin="11" end="17" type="mention" uri="xmpp:gibson@localhost" xmlns="urn:xmpp:reference:0"/>`+
                                `<reference begin="6" end="10" type="mention" uri="xmpp:z3r0@localhost" xmlns="urn:xmpp:reference:0"/>`+
@@ -2374,7 +2372,6 @@
                            `xmlns="jabber:client">`+
                                `<body>hello z3r0 gibson sw0rdf1sh, how are you?</body>`+
                                `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
-                                `<request xmlns="urn:xmpp:receipts"/>`+
                                `<reference begin="18" end="27" type="mention" uri="xmpp:sw0rdf1sh@localhost" xmlns="urn:xmpp:reference:0"/>`+
                                `<reference begin="11" end="17" type="mention" uri="xmpp:gibson@localhost" xmlns="urn:xmpp:reference:0"/>`+
                                `<reference begin="6" end="10" type="mention" uri="xmpp:z3r0@localhost" xmlns="urn:xmpp:reference:0"/>`+
@@ -2423,7 +2420,6 @@
                                `xmlns="jabber:client">`+
                                    `<body>hello z3r0 gibson mr.robot, how are you?</body>`+
                                    `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
-                                    `<request xmlns="urn:xmpp:receipts"/>`+
                                    `<reference begin="18" end="26" type="mention" uri="xmpp:mr.robot@localhost" xmlns="urn:xmpp:reference:0"/>`+
                                    `<reference begin="11" end="17" type="mention" uri="xmpp:gibson@localhost" xmlns="urn:xmpp:reference:0"/>`+
                                    `<reference begin="6" end="10" type="mention" uri="xmpp:z3r0@localhost" xmlns="urn:xmpp:reference:0"/>`+

--- 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();