PoC fix for conversejs#1442

laszlovl · Feb 12, 2019 · 0dad10f · 0dad10f
1 parent 81b6dfe
commit 0dad10f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/dist/converse.js b/dist/converse.js
@@ -61716,13 +61716,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
         _converse.api.send(receipt_stanza);
       },
 
-      handleReceipt(stanza, from_jid, is_carbon, is_me) {
-        const requests_receipt = !_.isUndefined(sizzle(`request[xmlns="${Strophe.NS.RECEIPTS}"]`, stanza).pop());
-
-        if (requests_receipt && !is_carbon && !is_me) {
-          this.sendReceiptStanza(from_jid, stanza.getAttribute('id'));
-        }
-
+      handleReceipt(stanza) {
         const to_bare_jid = Strophe.getBareJidFromJid(stanza.getAttribute('to'));
 
         if (to_bare_jid === _converse.bare_jid) {
@@ -62257,8 +62251,13 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
           'fullname': _.get(_converse.api.contacts.get(contact_jid), 'attributes.fullname')
         },
               chatbox = this.getChatBox(contact_jid, chatbox_attrs, has_body);
+        const requests_receipt = !_.isUndefined(sizzle(`request[xmlns="${Strophe.NS.RECEIPTS}"]`, stanza).pop());
 
-        if (chatbox && !chatbox.handleMessageCorrection(stanza) && !chatbox.handleReceipt(stanza, from_jid, is_carbon, is_me) && !chatbox.handleChatMarker(stanza, from_jid, is_carbon)) {
+        if (requests_receipt && !is_carbon && !is_me) {
+          this.sendReceiptStanza(from_jid, stanza.getAttribute('id'));
+        }
+
+        if (chatbox && !chatbox.handleMessageCorrection(stanza) && !chatbox.handleReceipt(stanza) && !chatbox.handleChatMarker(stanza, from_jid, is_carbon)) {
           await chatbox.createMessage(stanza, original_stanza);
         }
 
@@ -67030,6 +67029,10 @@ _converse_core__WEBPACK_IMPORTED_MODULE_6__["default"].plugins.add('converse-muc
             return;
           }
 
+          if (this.handleReceipt(stanza)) {
+            return;
+          }
+
           const msg = await this.messages.create(attrs);
 
           if (forwarded && msg && msg.get('sender') === 'me') {

diff --git a/src/headless/converse-chatboxes.js b/src/headless/converse-chatboxes.js
@@ -368,11 +368,7 @@ converse.plugins.add('converse-chatboxes', {
                 _converse.api.send(receipt_stanza);
             },
 
-            handleReceipt (stanza, from_jid, is_carbon, is_me) {
-                const requests_receipt = !_.isUndefined(sizzle(`request[xmlns="${Strophe.NS.RECEIPTS}"]`, stanza).pop());
-                if (requests_receipt && !is_carbon && !is_me) {
-                    this.sendReceiptStanza(from_jid, stanza.getAttribute('id'));
-                }
+            handleReceipt (stanza) {
                 const to_bare_jid = Strophe.getBareJidFromJid(stanza.getAttribute('to'));
                 if (to_bare_jid === _converse.bare_jid) {
                     const receipt = sizzle(`received[xmlns="${Strophe.NS.RECEIPTS}"]`, stanza).pop();
@@ -850,9 +846,15 @@ converse.plugins.add('converse-chatboxes', {
                 const has_body = sizzle(`body, encrypted[xmlns="${Strophe.NS.OMEMO}"]`, stanza).length > 0,
                       chatbox_attrs = {'fullname': _.get(_converse.api.contacts.get(contact_jid), 'attributes.fullname')},
                       chatbox = this.getChatBox(contact_jid, chatbox_attrs, has_body);
+
+                const requests_receipt = !_.isUndefined(sizzle(`request[xmlns="${Strophe.NS.RECEIPTS}"]`, stanza).pop());
+                if (requests_receipt && !is_carbon && !is_me) {
+                    this.sendReceiptStanza(from_jid, stanza.getAttribute('id'));
+                }
+
                 if (chatbox &&
                         !chatbox.handleMessageCorrection(stanza) &&
-                        !chatbox.handleReceipt (stanza, from_jid, is_carbon, is_me) &&
+                        !chatbox.handleReceipt (stanza) &&
                         !chatbox.handleChatMarker(stanza, from_jid, is_carbon)) {
                     await chatbox.createMessage(stanza, original_stanza);
                 }

diff --git a/src/headless/converse-muc.js b/src/headless/converse-muc.js
@@ -1015,6 +1015,11 @@ converse.plugins.add('converse-muc', {
                         // No need showing delayed or our own CSN messages
                         return;
                     }
+
+                    if (this.handleReceipt (stanza)) {
+                        return;
+                    }
+
                     const msg = await this.messages.create(attrs);
                     if (forwarded && msg && msg.get('sender')  === 'me') {
                         msg.save({'received': moment().format()});