From 889403bc0d54c1195e125b0b764df04f3eaa76bf Mon Sep 17 00:00:00 2001
From: chylex <contact@chylex.com>
Date: Fri, 6 Sep 2019 05:52:16 +0200
Subject: [PATCH] Add support for custom emoji in the viewer

---
 src/renderer/scr.discord.js   | 6 ++++--
 src/renderer/stl.messages.css | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/renderer/scr.discord.js b/src/renderer/scr.discord.js
index a8914f2..bbc6f61 100644
--- a/src/renderer/scr.discord.js
+++ b/src/renderer/scr.discord.js
@@ -14,7 +14,8 @@ var DISCORD = (function(){
     specialUnescaped: /([*_~\\])/g,
     mentionRole: /&lt;@&(\d+?)&gt;/g,
     mentionUser: /&lt;@!?(\d+?)&gt;/g,
-    mentionChannel: /&lt;#(\d+?)&gt;/g
+    mentionChannel: /&lt;#(\d+?)&gt;/g,
+    customEmoji: /&lt;:([^:]+):(\d+?)&gt;/g
   };
   
   var isImageAttachment = function(attachment){
@@ -121,7 +122,8 @@ var DISCORD = (function(){
           processed = processed
             .replace(REGEX.formatUrl, "<a href='$1' target='_blank' rel='noreferrer'>$1</a>")
             .replace(REGEX.mentionChannel, (full, match) => "<span class='link mention-chat'>#"+STATE.getChannelName(match)+"</span>")
-            .replace(REGEX.mentionUser, (full, match) => "<span class='link mention-user'>@"+STATE.getUserName(match)+"</span>");
+            .replace(REGEX.mentionUser, (full, match) => "<span class='link mention-user'>@"+STATE.getUserName(match)+"</span>")
+            .replace(REGEX.customEmoji, "<img src='https://cdn.discordapp.com/emojis/$2.png' alt=':$1:' title=':$1:' class='emoji'>");
           
           return "<p>"+processed+"</p>";
         }
diff --git a/src/renderer/stl.messages.css b/src/renderer/stl.messages.css
index e2f8aea..16edfc9 100644
--- a/src/renderer/stl.messages.css
+++ b/src/renderer/stl.messages.css
@@ -119,3 +119,11 @@
   margin-top: 6px;
   padding: 7px;
 }
+
+.message .emoji {
+  width: 22px;
+  height: 22px;
+  margin: 0 1px;
+  vertical-align: -30%;
+  object-fit: contain;
+}