Home Explore Help
Register Sign In
im-changing.ru
/
converse.js
mirror of https://github.com/conversejs/converse.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

don't send receipt requests in MUCs

Christoph Scholz 6 years ago
parent
d341c6a13b
commit
267d91a4f3
5 changed files with 11 additions and 10 deletions
Unified View Show Diff Stats
  1. 1 0
      CHANGES.md
  2. 6 2
      dist/converse.js
  3. 0 1
      spec/http-file-upload.js
  4. 0 4
      spec/messages.js
  5. 4 3
      src/headless/converse-chatboxes.js

+ 1 - 0
CHANGES.md
View File 

@@ -4,6 +4,7 @@
 
 
 
 - Don't render http (i.e. non-TLS) resources
 
 - Don't render http (i.e. non-TLS) resources
 
 - #1331 Fix missing checkmarks in old muc messages
 
 - #1331 Fix missing checkmarks in old muc messages
 
+- #1333 Don't send receipt requests in MUCs
 
 
 
 ## 4.0.5 (2018-11-15)
 
 ## 4.0.5 (2018-11-15)

+ 6 - 2
dist/converse.js
View File 

@@ -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')
 
           'id': message.get('edited') && _converse.connection.getUniqueId() || message.get('msgid')
 
         }).c('body').t(message.get('message')).up().c(_converse.ACTIVE, {
 
         }).c('body').t(message.get('message')).up().c(_converse.ACTIVE, {
 
           'xmlns': Strophe.NS.CHATSTATES
 
           'xmlns': Strophe.NS.CHATSTATES
 
-        }).up().c('request', {
 
-          'xmlns': Strophe.NS.RECEIPTS
 
         }).up();
 
         }).up();
 
 
 
+        if (message.get('type') === 'chat') {
 
+          stanza.c('request', {
 
+            'xmlns': Strophe.NS.RECEIPTS
 
+          }).up();
 
+        }
 
+
 
         if (message.get('is_spoiler')) {
 
         if (message.get('is_spoiler')) {
 
           if (message.get('spoiler_hint')) {
 
           if (message.get('spoiler_hint')) {
 
             stanza.c('spoiler', {
 
             stanza.c('spoiler', {

+ 0 - 1
spec/http-file-upload.js
View File 

@@ -461,7 +461,6 @@
 
                                 `xmlns="jabber:client">`+
 
                                 `xmlns="jabber:client">`+
 
                                     `<body>${message}</body>`+
 
                                     `<body>${message}</body>`+
 
                                     `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
 
                                     `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
 
-                                    `<request xmlns="urn:xmpp:receipts"/>`+
 
                                     `<x xmlns="jabber:x:oob">`+
 
                                     `<x xmlns="jabber:x:oob">`+
 
                                         `<url>${message}</url>`+
 
                                         `<url>${message}</url>`+
 
                                     `</x>`+
 
                                     `</x>`+

+ 0 - 4
spec/messages.js
View File 

@@ -2125,7 +2125,6 @@
 
                     `xmlns="jabber:client">`+
 
                     `xmlns="jabber:client">`+
 
                         `<body>But soft, what light through yonder window breaks?</body>`+
 
                         `<body>But soft, what light through yonder window breaks?</body>`+
 
                         `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
 
                         `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
 
-                        `<request xmlns="urn:xmpp:receipts"/>`+
 
                         `<replace id="${first_msg.get("msgid")}" xmlns="urn:xmpp:message-correct:0"/>`+
 
                         `<replace id="${first_msg.get("msgid")}" xmlns="urn:xmpp:message-correct:0"/>`+
 
                 `</message>`);
 
                 `</message>`);
 
 
 
@@ -2348,7 +2347,6 @@
 
                             `xmlns="jabber:client">`+
 
                             `xmlns="jabber:client">`+
 
                                 `<body>hello z3r0 gibson mr.robot, how are you?</body>`+
 
                                 `<body>hello z3r0 gibson mr.robot, how are you?</body>`+
 
                                 `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
 
                                 `<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="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="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"/>`+
 
                                 `<reference begin="6" end="10" type="mention" uri="xmpp:z3r0@localhost" xmlns="urn:xmpp:reference:0"/>`+
 
@@ -2374,7 +2372,6 @@
 
                             `xmlns="jabber:client">`+
 
                             `xmlns="jabber:client">`+
 
                                 `<body>hello z3r0 gibson sw0rdf1sh, how are you?</body>`+
 
                                 `<body>hello z3r0 gibson sw0rdf1sh, how are you?</body>`+
 
                                 `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
 
                                 `<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="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="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"/>`+
 
                                 `<reference begin="6" end="10" type="mention" uri="xmpp:z3r0@localhost" xmlns="urn:xmpp:reference:0"/>`+
 
@@ -2423,7 +2420,6 @@
 
                                 `xmlns="jabber:client">`+
 
                                 `xmlns="jabber:client">`+
 
                                     `<body>hello z3r0 gibson mr.robot, how are you?</body>`+
 
                                     `<body>hello z3r0 gibson mr.robot, how are you?</body>`+
 
                                     `<active xmlns="http://jabber.org/protocol/chatstates"/>`+
 
                                     `<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="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="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"/>`+
 
                                     `<reference begin="6" end="10" type="mention" uri="xmpp:z3r0@localhost" xmlns="urn:xmpp:reference:0"/>`+

+ 4 - 3
src/headless/converse-chatboxes.js
View File 

@@ -329,9 +329,10 @@ converse.plugins.add('converse-chatboxes', {
 
                         'type': this.get('message_type'),
 
                         'type': this.get('message_type'),
 
                         'id': message.get('edited') && _converse.connection.getUniqueId() || message.get('msgid'),
 
                         'id': message.get('edited') && _converse.connection.getUniqueId() || message.get('msgid'),
 
                     }).c('body').t(message.get('message')).up()
 
                     }).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('is_spoiler')) {
 
                     if (message.get('spoiler_hint')) {
 
                     if (message.get('spoiler_hint')) {
 
                         stanza.c('spoiler', {'xmlns': Strophe.NS.SPOILER}, message.get('spoiler_hint')).up();
 
                         stanza.c('spoiler', {'xmlns': Strophe.NS.SPOILER}, message.get('spoiler_hint')).up();