diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-07 16:15:41 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2021-09-07 16:15:41 +0000 |
| commit | 8af1f08539d7c2863107bd3dfd36002b7558e252 (patch) | |
| tree | a50006d11cdf6b834b49c2c98dc192609ba4471a /src/components/notification/notification.vue | |
| parent | 25a8b48bf28e1a0e0765f28221c5528f5854656b (diff) | |
| parent | 4d73eaa6cef7a8b81bcca719755b11c05717d395 (diff) | |
Merge branch 'better-still-emoji' into 'develop'
Status HTML parsing - better emoji and mentions rendering
Closes #935
See merge request pleroma/pleroma-fe!1392
Diffstat (limited to 'src/components/notification/notification.vue')
| -rw-r--r-- | src/components/notification/notification.vue | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 0081dee4..634ec8ee 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -51,12 +51,14 @@ <span class="notification-details"> <div class="name-and-action"> <!-- eslint-disable vue/no-v-html --> - <bdi - v-if="!!notification.from_profile.name_html" - class="username" - :title="'@'+notification.from_profile.screen_name_ui" - v-html="notification.from_profile.name_html" - /> + <bdi v-if="!!notification.from_profile.name_html"> + <RichContent + class="username" + :title="'@'+notification.from_profile.screen_name_ui" + :html="notification.from_profile.name_html" + :emoji="notification.from_profile.emoji" + /> + </bdi> <!-- eslint-enable vue/no-v-html --> <span v-else |