Commit 1a518f3d authored by JC Brand's avatar JC Brand Committed by GitHub

Merge pull request #1029 from ChaosKid42/send_emojis_as_unicode_muc

send emojis as unicode also in MUCs
parents 0a28e7aa ca0bd1c5
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
- Avoid `eval` (via `_.template` from lodash). - Avoid `eval` (via `_.template` from lodash).
- Don't show bookmark toggles when PEP bookmarking not supported by the XMPP server. - Don't show bookmark toggles when PEP bookmarking not supported by the XMPP server.
- Emojis are now sent in unicode instead of short names (also in MUCs)
### Bugfixes ### Bugfixes
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
define([ define([
"form-utils", "form-utils",
"converse-core", "converse-core",
"emojione",
"lodash.fp", "lodash.fp",
"tpl!chatarea", "tpl!chatarea",
"tpl!chatroom", "tpl!chatroom",
...@@ -44,6 +45,7 @@ ...@@ -44,6 +45,7 @@
}(this, function ( }(this, function (
u, u,
converse, converse,
emojione,
fp, fp,
tpl_chatarea, tpl_chatarea,
tpl_chatroom, tpl_chatroom,
...@@ -969,6 +971,7 @@ ...@@ -969,6 +971,7 @@
* Parameters: * Parameters:
* (String) text: The message text to be sent. * (String) text: The message text to be sent.
*/ */
text = emojione.shortnameToUnicode(text)
const msgid = _converse.connection.getUniqueId(); const msgid = _converse.connection.getUniqueId();
const msg = $msg({ const msg = $msg({
to: this.model.get('jid'), to: this.model.get('jid'),
......
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