From c81eb49f9e07d889678f7241c85a5b51dac09a26 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Wed, 26 Dec 2018 05:15:02 +0900 Subject: [PATCH] Supports emoji in notifications (#3751) --- .../views/components/notifications.vue | 24 ++++++++++++++----- .../views/pages/deck/deck.notification.vue | 11 ++++++--- .../mobile/views/components/notification.vue | 11 ++++++--- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue index 07ebc5586a..ccd82a92ed 100644 --- a/src/client/app/desktop/views/components/notifications.vue +++ b/src/client/app/desktop/views/components/notifications.vue @@ -23,7 +23,9 @@

- {{ getNoteSummary(notification.note) }} + + + @@ -37,7 +39,9 @@

- {{ getNoteSummary(notification.note.renote) }} + + + @@ -50,7 +54,9 @@

- {{ getNoteSummary(notification.note) }} + + + @@ -84,7 +90,9 @@

- {{ getNoteSummary(notification.note) }} + + + @@ -96,7 +104,9 @@

- {{ getNoteSummary(notification.note) }} + + + @@ -107,7 +117,9 @@

- {{ getNoteSummary(notification.note) }} + + + diff --git a/src/client/app/desktop/views/pages/deck/deck.notification.vue b/src/client/app/desktop/views/pages/deck/deck.notification.vue index 60cc490804..70b54eac6c 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notification.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notification.vue @@ -11,7 +11,8 @@ - {{ getNoteSummary(notification.note) }} + + @@ -28,7 +29,9 @@ - {{ getNoteSummary(notification.note.renote) }} + + + @@ -70,7 +73,9 @@ - {{ getNoteSummary(notification.note) }} + + + diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue index a0310abe8e..3b9c6577d4 100644 --- a/src/client/app/mobile/views/components/notification.vue +++ b/src/client/app/mobile/views/components/notification.vue @@ -9,7 +9,8 @@ - {{ getNoteSummary(notification.note) }} + + @@ -24,7 +25,9 @@ - {{ getNoteSummary(notification.note.renote) }} + + + @@ -60,7 +63,9 @@ - {{ getNoteSummary(notification.note) }} + + +