Prefer message's mentioned emoji over builtin emoji

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/render.js b/lib/render.js
index 0135205..83c6d10 100644
--- a/lib/render.js
+++ b/lib/render.js
@@ -88,14 +88,6 @@ function Render(app, opts) {
 
 Render.prototype.emoji = function (emoji) {
   var name = ':' + emoji + ':'
-  if (emoji in emojis) {
-    return h('img.ssb-emoji', {
-      src: this.opts.emoji_base + emoji + '.png',
-      alt: name,
-      height: 17,
-      title: name,
-    })
-  }
   var link = this._mentions[name]
   if (link && link.link) {
     this.app.reverseEmojiNameCache.set(emoji, link.link)
@@ -107,6 +99,14 @@ Render.prototype.emoji = function (emoji) {
       title: name,
     })
   }
+  if (emoji in emojis) {
+    return h('img.ssb-emoji', {
+      src: this.opts.emoji_base + emoji + '.png',
+      alt: name,
+      height: 17,
+      title: name,
+    })
+  }
   return name
 }