Commit 22531269 authored by JC Brand's avatar JC Brand

Two small updates

* Ensure that outgoing messages are also marked as single emojis
* Also set msgid to origin-id for sent groupchat messages
parent 3ce3d661
......@@ -3,7 +3,7 @@
## 4.1.3 (Unreleased)
- Updated translation: lt
- Upgrade to Backbone 1.4.0 and Strophe 1.3.2
- Upgrade to Backbone 1.4.0, Strophe 1.3.2 and Jasmine 2.99.2
- Fix "flashing" of roster filter when you have less than 5 roster contacts.
- Fix handling of CAPTCHAs offered by ejabberd.
- Don't send out receipts or markers for MAM messages
......
......@@ -62486,6 +62486,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
'origin_id': origin_id,
'fullname': _converse.xmppstatus.get('fullname'),
'from': _converse.bare_jid,
'is_single_emoji': text ? u.isSingleEmoji(text) : false,
'sender': 'me',
'time': moment().format(),
'message': text ? u.httpToGeoUri(u.shortnameToUnicode(text), _converse) : undefined,
......@@ -66969,10 +66970,15 @@ _converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins.add('converse-muc
text = _this$parseTextForRef2[0];
references = _this$parseTextForRef2[1];
const origin_id = _converse.connection.getUniqueId();
return {
'origin_id': _converse.connection.getUniqueId(),
'msgid': origin_id,
'origin_id': origin_id,
'from': `${this.get('jid')}/${this.get('nick')}`,
'fullname': this.get('nick'),
'is_single_emoji': text ? _utils_form__WEBPACK_IMPORTED_MODULE_4__["default"].isSingleEmoji(text) : false,
'is_spoiler': is_spoiler,
'message': text ? _utils_form__WEBPACK_IMPORTED_MODULE_4__["default"].httpToGeoUri(_utils_form__WEBPACK_IMPORTED_MODULE_4__["default"].shortnameToUnicode(text), _converse) : undefined,
'nick': this.get('nick'),
......@@ -505,6 +505,7 @@ converse.plugins.add('converse-chatboxes', {
'origin_id': origin_id,
'fullname': _converse.xmppstatus.get('fullname'),
'from': _converse.bare_jid,
'is_single_emoji': text ? u.isSingleEmoji(text) : false,
'sender': 'me',
'time': moment().format(),
'message': text ? u.httpToGeoUri(u.shortnameToUnicode(text), _converse) : undefined,
......
......@@ -414,11 +414,14 @@ converse.plugins.add('converse-muc', {
const is_spoiler = this.get('composing_spoiler');
var references;
[text, references] = this.parseTextForReferences(text);
const origin_id = _converse.connection.getUniqueId();
return {
'origin_id': _converse.connection.getUniqueId(),
'msgid': origin_id,
'origin_id': origin_id,
'from': `${this.get('jid')}/${this.get('nick')}`,
'fullname': this.get('nick'),
'is_single_emoji': text ? u.isSingleEmoji(text) : false,
'is_spoiler': is_spoiler,
'message': text ? u.httpToGeoUri(u.shortnameToUnicode(text), _converse) : undefined,
'nick': this.get('nick'),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment