From 2195e8de7e4b5723083663ee07429b49f171724b Mon Sep 17 00:00:00 2001
From: Christoph Scholz <christoph.scholz@gmail.com>
Date: Fri, 2 Mar 2018 15:45:36 +0100
Subject: [PATCH] send emojis as unicode also in MUCs

---
 CHANGES.md          | 1 +
 src/converse-muc.js | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 3460ca10c..5b9c297f3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@
 - Avoid `eval` (via `_.template` from lodash).
 - Don't show bookmark toggles when PEP bookmarking not supported by the XMPP server.
 - Add LibreJS support
+- Emojis are now sent in unicode instead of short names (also in MUCs)
 
 ### Bugfixes
 
diff --git a/src/converse-muc.js b/src/converse-muc.js
index 4f5dbf20a..7d50df5b3 100644
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -13,6 +13,7 @@
     define([
             "form-utils",
             "converse-core",
+            "emojione",
             "lodash.fp",
             "tpl!chatarea",
             "tpl!chatroom",
@@ -44,6 +45,7 @@
 }(this, function (
             u,
             converse,
+            emojione,
             fp,
             tpl_chatarea,
             tpl_chatroom,
@@ -969,6 +971,7 @@
                      * Parameters:
                      *  (String) text: The message text to be sent.
                      */
+                    text = emojione.shortnameToUnicode(text)
                     const msgid = _converse.connection.getUniqueId();
                     const msg = $msg({
                         to: this.model.get('jid'),