From a9f8ec54533cdc39169262b211f7e3a68af555bd Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sun, 12 Jun 2022 14:11:07 +0100
Subject: [PATCH] add custom emoji display

---
 src/components/notification/notification.scss       |  6 ++++++
 src/components/notification/notification.vue        | 13 ++++++++++++-
 .../entity_normalizer/entity_normalizer.service.js  |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
index 38978137..80e3dac3 100644
--- a/src/components/notification/notification.scss
+++ b/src/components/notification/notification.scss
@@ -1,5 +1,11 @@
 @import '../../_variables.scss';
 
+.reaction-emoji {
+  width: 40px;
+  display: flex;
+  flex-direction: column;
+}
+
 // TODO Copypaste from Status, should unify it somehow
 .Notification {
    border-bottom: 1px solid;
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 7d3d0c69..0dfb26f8 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -116,7 +116,18 @@
                   scope="global"
                   keypath="notifications.reacted_with"
                 >
-                  <span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
+                  <img
+                    v-if="notification.emoji_url !== null"
+                    class="reaction-emoji"
+                    :src="notification.emoji_url"
+                    :name="notification.emoji"
+                  >
+                  <span
+                    v-else
+                    class="emoji-reaction-emoji"
+                  >
+                    {{ notification.emoji }}
+                  </span>
                 </i18n-t>
               </small>
             </span>
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index f219c161..9d0285b9 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -387,6 +387,7 @@ export const parseNotification = (data) => {
       : parseUser(data.target)
     output.from_profile = parseUser(data.account)
     output.emoji = data.emoji
+    output.emoji_url = data.emoji_url
   } else {
     const parsedNotice = parseStatus(data.notice)
     output.type = data.ntype