summaryrefslogtreecommitdiff
path: root/src/client/app/desktop/views/widgets/users.vue
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2018-12-06 10:02:04 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-12-06 10:02:04 +0900
commit452256874930093d07ad6734f72293b4334a3b9e (patch)
tree6bf45b67be29d279201ea122b922f8dd6bde7361 /src/client/app/desktop/views/widgets/users.vue
parent外部サービス連携情報をPersonのfieldsに乗せて配信する (#3499) (diff)
downloadmisskey-452256874930093d07ad6734f72293b4334a3b9e.tar.gz
misskey-452256874930093d07ad6734f72293b4334a3b9e.tar.bz2
misskey-452256874930093d07ad6734f72293b4334a3b9e.zip
Emoji support in profile (#3514)
* Emoji in profile * Add emojis to fields
Diffstat (limited to 'src/client/app/desktop/views/widgets/users.vue')
-rw-r--r--src/client/app/desktop/views/widgets/users.vue4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/app/desktop/views/widgets/users.vue b/src/client/app/desktop/views/widgets/users.vue
index 7890b6df04..cfc1afe14d 100644
--- a/src/client/app/desktop/views/widgets/users.vue
+++ b/src/client/app/desktop/views/widgets/users.vue
@@ -13,7 +13,9 @@
<div class="user" v-for="_user in users">
<mk-avatar class="avatar" :user="_user"/>
<div class="body">
- <router-link class="name" :to="_user | userPage" v-user-preview="_user.id">{{ _user | userName }}</router-link>
+ <router-link class="name" :to="_user | userPage" v-user-preview="_user.id">
+ <misskey-flavored-markdown :text="_user.name || _user.username" :shouldBreak="false" :plainText="true" :custom-emojis="_user.emojis"/>
+ </router-link>
<p class="username">@{{ _user | acct }}</p>
</div>
</div>