浏览代码

fix LMC with Conversations

Christoph Scholz 6 年之前
父节点
当前提交
10da92ec5b
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      CHANGES.md
  2. 1 1
      dist/converse.js
  3. 1 1
      src/headless/converse-chatboxes.js

+ 1 - 0
CHANGES.md

@@ -23,6 +23,7 @@
 - #1479: Allow file upload by drag & drop also in MUCs
 - #1487: New config option [muc_respect_autojoin](https://conversejs.org/docs/html/configuration.html#muc-respect-autojoin)
 - #1501: Don't prompt for a reason if [auto_join_on_invite](https://conversejs.org/docs/html/configuration.html#auto-join-on-invite) is `true`
+- #1507: Make message id and origin-id identical in order to fix LMC with Conversations
 
 
 ## 4.1.2 (2019-02-22)

+ 1 - 1
dist/converse.js

@@ -62474,7 +62474,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
               origin_id = _converse.connection.getUniqueId();
 
         return _.extend(this.toJSON(), {
-          'id': origin_id,
+          'msgid': origin_id,
           'origin_id': origin_id,
           'fullname': _converse.xmppstatus.get('fullname'),
           'from': _converse.bare_jid,

+ 1 - 1
src/headless/converse-chatboxes.js

@@ -499,7 +499,7 @@ converse.plugins.add('converse-chatboxes', {
                       origin_id = _converse.connection.getUniqueId();
 
                 return _.extend(this.toJSON(), {
-                    'id': origin_id,
+                    'msgid': origin_id,
                     'origin_id': origin_id,
                     'fullname': _converse.xmppstatus.get('fullname'),
                     'from': _converse.bare_jid,