diff options
| author | Henry Jameson <me@hjkos.com> | 2023-03-20 22:48:38 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2023-03-20 22:48:38 +0200 |
| commit | 819cd41cf0c4b2140470bba2a36eb15ed811c5b7 (patch) | |
| tree | 0608e5f10fa4028391e1100729e5fade4d3ba08c /src/components/notification/notification.vue | |
| parent | 332ad77e3579d2b512ba236b3f2c94ad8875864d (diff) | |
| parent | fa532b1f005220743d036b7d103c47a043be7ae4 (diff) | |
Merge remote-tracking branch 'origin/develop' into improve_settings_reusability
* origin/develop:
Translated using Weblate (Chinese (Simplified))
Generalize IntegerSetting into NumberSetting, add Integer/Float wrappers
Allow custom emoji reactions: add option to scale reaction buttons
Fix user-profile route crash on pinned favorites route
Hide custom emoji in reaction picker when BE does not advertise pleroma_custom_emoji_reactions
Allow custom emoji reactions
Diffstat (limited to 'src/components/notification/notification.vue')
| -rw-r--r-- | src/components/notification/notification.vue | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 8d4cc2d1..13e7f9b8 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -121,7 +121,16 @@ scope="global" keypath="notifications.reacted_with" > - <span class="emoji-reaction-emoji">{{ notification.emoji }}</span> + <img + v-if="notification.emoji_url" + class="emoji-reaction-emoji emoji-reaction-emoji-image" + :src="notification.emoji_url" + :name="notification.emoji" + > + <span + v-else + class="emoji-reaction-emoji" + >{{ notification.emoji }}</span> </i18n-t> </small> </span> |