Browse Source

Bugfix. Don't extend chatbox attributes

when creating attributes for outgoing message.

Otherwise `id` is the same for all messages.
JC Brand 6 years ago
parent
commit
e0cb3c34bb
2 changed files with 8 additions and 4 deletions
  1. 4 2
      dist/converse.js
  2. 4 2
      src/headless/converse-chatboxes.js

+ 4 - 2
dist/converse.js

@@ -62473,7 +62473,9 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
         const is_spoiler = this.get('composing_spoiler'),
         const is_spoiler = this.get('composing_spoiler'),
               origin_id = _converse.connection.getUniqueId();
               origin_id = _converse.connection.getUniqueId();
 
 
-        return _.extend(this.toJSON(), {
+        return {
+          'jid': this.get('jid'),
+          'nickname': this.get('nickname'),
           'msgid': origin_id,
           'msgid': origin_id,
           'origin_id': origin_id,
           'origin_id': origin_id,
           'fullname': _converse.xmppstatus.get('fullname'),
           'fullname': _converse.xmppstatus.get('fullname'),
@@ -62484,7 +62486,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
           'is_spoiler': is_spoiler,
           'is_spoiler': is_spoiler,
           'spoiler_hint': is_spoiler ? spoiler_hint : undefined,
           'spoiler_hint': is_spoiler ? spoiler_hint : undefined,
           'type': this.get('message_type')
           'type': this.get('message_type')
-        });
+        };
       },
       },
 
 
       /**
       /**

+ 4 - 2
src/headless/converse-chatboxes.js

@@ -498,7 +498,9 @@ converse.plugins.add('converse-chatboxes', {
                 const is_spoiler = this.get('composing_spoiler'),
                 const is_spoiler = this.get('composing_spoiler'),
                       origin_id = _converse.connection.getUniqueId();
                       origin_id = _converse.connection.getUniqueId();
 
 
-                return _.extend(this.toJSON(), {
+                return {
+                    'jid': this.get('jid'),
+                    'nickname': this.get('nickname'),
                     'msgid': origin_id,
                     'msgid': origin_id,
                     'origin_id': origin_id,
                     'origin_id': origin_id,
                     'fullname': _converse.xmppstatus.get('fullname'),
                     'fullname': _converse.xmppstatus.get('fullname'),
@@ -509,7 +511,7 @@ converse.plugins.add('converse-chatboxes', {
                     'is_spoiler': is_spoiler,
                     'is_spoiler': is_spoiler,
                     'spoiler_hint': is_spoiler ? spoiler_hint : undefined,
                     'spoiler_hint': is_spoiler ? spoiler_hint : undefined,
                     'type': this.get('message_type')
                     'type': this.get('message_type')
-                });
+                }
             },
             },
 
 
             /**
             /**