summaryrefslogtreecommitdiff
path: root/src/client/app/desktop/views/pages/deck/deck.notification.vue
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2018-12-26 05:15:02 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-12-26 05:15:02 +0900
commitc81eb49f9e07d889678f7241c85a5b51dac09a26 (patch)
tree87aca25275e2504a6beb094689c7296dcb92afc1 /src/client/app/desktop/views/pages/deck/deck.notification.vue
parentFix typo (diff)
downloadmisskey-c81eb49f9e07d889678f7241c85a5b51dac09a26.tar.gz
misskey-c81eb49f9e07d889678f7241c85a5b51dac09a26.tar.bz2
misskey-c81eb49f9e07d889678f7241c85a5b51dac09a26.zip
Supports emoji in notifications (#3751)
Diffstat (limited to 'src/client/app/desktop/views/pages/deck/deck.notification.vue')
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.notification.vue11
1 files changed, 8 insertions, 3 deletions
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 @@
<mk-time :time="notification.createdAt"/>
</header>
<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
- <fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}
+ <fa icon="quote-left"/>
+ <misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
<fa icon="quote-right"/>
</router-link>
</div>
@@ -28,7 +29,9 @@
<mk-time :time="notification.createdAt"/>
</header>
<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)">
- <fa icon="quote-left"/>{{ getNoteSummary(notification.note.renote) }}<fa icon="quote-right"/>
+ <fa icon="quote-left"/>
+ <misskey-flavored-markdown :text="getNoteSummary(notification.note.renote)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.renote.emojis"/>
+ <fa icon="quote-right"/>
</router-link>
</div>
</div>
@@ -70,7 +73,9 @@
<mk-time :time="notification.createdAt"/>
</header>
<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
- <fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}<fa icon="quote-right"/>
+ <fa icon="quote-left"/>
+ <misskey-flavored-markdown :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+ <fa icon="quote-right"/>
</router-link>
</div>
</div>