From 584d7b9070f3c4ad05308c809e30b3ce0d1c5fce Mon Sep 17 00:00:00 2001
From: cel <cel@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519>
Date: Tue, 30 May 2017 12:57:27 -1000
Subject: Prefer message's mentioned emoji over builtin emoji

---
 lib/render.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib/render.js')

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
 }
 
-- 
cgit v1.2.3