Have you heard this funny audio?
');
+ expect(msg.classList.length).toEqual(1);
+ expect(u.hasClass('chat-msg__text', msg)).toBe(true);
+ expect(msg.textContent).toEqual('Have you heard this funny audio?');
let media = view.el.querySelector('.chat-msg .chat-msg__media');
expect(media.innerHTML.replace(/(\r\n|\n|\r)/gm, "")).toEqual(
''+
@@ -1919,7 +1945,8 @@
_converse.connection._dataRecv(test_utils.createRequest(stanza));
await test_utils.waitUntil(() => view.el.querySelectorAll('.chat-content .chat-msg video').length, 2000)
let msg = view.el.querySelector('.chat-msg .chat-msg__text');
- expect(msg.outerHTML).toEqual('Have you seen this funny video?
');
+ expect(msg.classList.length).toBe(1);
+ expect(msg.textContent).toEqual('Have you seen this funny video?');
let media = view.el.querySelector('.chat-msg .chat-msg__media');
expect(media.innerHTML.replace(/(\r\n|\n|\r)/gm, "")).toEqual(
''+
@@ -1967,7 +1994,8 @@
await new Promise((resolve, reject) => view.once('messageInserted', resolve));
await test_utils.waitUntil(() => view.el.querySelectorAll('.chat-content .chat-msg a').length, 1000);
const msg = view.el.querySelector('.chat-msg .chat-msg__text');
- expect(msg.outerHTML).toEqual('Have you downloaded this funny file?
');
+ expect(u.hasClass('chat-msg__text', msg)).toBe(true);
+ expect(msg.textContent).toEqual('Have you downloaded this funny file?');
const media = view.el.querySelector('.chat-msg .chat-msg__media');
expect(media.innerHTML.replace(/(\r\n|\n|\r)/gm, "")).toEqual(
''+
@@ -1999,7 +2027,8 @@
await test_utils.waitUntil(() => view.el.querySelectorAll('.chat-content .chat-msg img').length, 2000);
const msg = view.el.querySelector('.chat-msg .chat-msg__text');
- expect(msg.outerHTML).toEqual('Have you seen this funny image?
');
+ expect(u.hasClass('chat-msg__text', msg)).toBe(true);
+ expect(msg.textContent).toEqual('Have you seen this funny image?');
const media = view.el.querySelector('.chat-msg .chat-msg__media');
expect(media.innerHTML.replace(/(\r\n|\n|\r)/gm, "")).toEqual(
``+
@@ -2633,11 +2662,13 @@
.c('reference', {'xmlns':'urn:xmpp:reference:0', 'begin':'15', 'end':'23', 'type':'mention', 'uri':'xmpp:mr.robot@localhost'}).nodeTree;
await view.model.onMessage(msg);
await new Promise((resolve, reject) => view.once('messageInserted', resolve));
- expect(view.el.querySelectorAll('.chat-msg__text').length).toBe(1);
- expect(view.el.querySelector('.chat-msg__text').outerHTML).toBe(
- 'hello z3r0 '+
+ const messages = view.el.querySelectorAll('.chat-msg__text');
+ expect(messages.length).toBe(1);
+ expect(messages[0].classList.length).toEqual(1);
+ expect(messages[0].innerHTML).toBe(
+ 'hello z3r0 '+
'tom '+
- 'mr.robot, how are you?
');
+ 'mr.robot, how are you?');
done();
}));
});
diff --git a/src/headless/converse-chatboxes.js b/src/headless/converse-chatboxes.js
index 1c00d4dfc..8a5664bfa 100644
--- a/src/headless/converse-chatboxes.js
+++ b/src/headless/converse-chatboxes.js
@@ -656,6 +656,7 @@ converse.plugins.add('converse-chatboxes', {
const archive = sizzle(`result[xmlns="${Strophe.NS.MAM}"]`, original_stanza).pop(),
spoiler = sizzle(`spoiler[xmlns="${Strophe.NS.SPOILER}"]`, original_stanza).pop(),
delay = sizzle(`delay[xmlns="${Strophe.NS.DELAY}"]`, original_stanza).pop(),
+ text = _converse.chatboxes.getMessageBody(stanza) || undefined,
chat_state = stanza.getElementsByTagName(_converse.COMPOSING).length && _converse.COMPOSING ||
stanza.getElementsByTagName(_converse.PAUSED).length && _converse.PAUSED ||
stanza.getElementsByTagName(_converse.INACTIVE).length && _converse.INACTIVE ||
@@ -667,7 +668,8 @@ converse.plugins.add('converse-chatboxes', {
'is_archived': !_.isNil(archive),
'is_delayed': !_.isNil(delay),
'is_spoiler': !_.isNil(spoiler),
- 'message': _converse.chatboxes.getMessageBody(stanza) || undefined,
+ 'is_single_emoji': text ? u.isSingleEmoji(text) : false,
+ 'message': text,
'msgid': stanza.getAttribute('id'),
'references': this.getReferencesFromStanza(stanza),
'subject': _.propertyOf(stanza.querySelector('subject'))('textContent'),
diff --git a/src/headless/utils/emoji.js b/src/headless/utils/emoji.js
index 9ae361fbc..ab06ea59e 100644
--- a/src/headless/utils/emoji.js
+++ b/src/headless/utils/emoji.js
@@ -160,6 +160,14 @@ function convert (unicode) {
return twemoji.default.convert.fromCodePoint(unicode);
}
+u.isSingleEmoji = function (str) {
+ if (!str || str.length > 2) {
+ return;
+ }
+ const result = _.flow(u.shortnameToUnicode, twemoji.default.parse)(str)
+ return result.match(/
/);
+}
+
u.shortnameToUnicode = function (str) {
/* will output unicode from shortname
* useful for sending emojis back to mobile devices
@@ -186,13 +194,8 @@ u.shortnameToUnicode = function (str) {
return str;
}
-
u.addEmoji = function (_converse, text) {
- if (_converse.use_system_emojis) {
- return u.shortnameToUnicode(text);
- } else {
- return twemoji.default.parse(text);
- }
+ return u.getEmojiRenderer(_converse)(text);
}
u.getEmojisByCategory = function (_converse) {
diff --git a/src/templates/message.html b/src/templates/message.html
index eb7f44f1a..800bc7704 100644
--- a/src/templates/message.html
+++ b/src/templates/message.html
@@ -26,7 +26,9 @@
{[ if (o.subject) { ]}
{{{ o.subject }}}
{[ } ]}
-
+
{[ if (!o.is_me_message) { ]}