From dea8688c9dd64aa5c3adbfe1da5e9ff267071131 Mon Sep 17 00:00:00 2001 From: syuilo <syuilotan@yahoo.co.jp> Date: Thu, 6 Dec 2018 16:09:33 +0900 Subject: [PATCH] Refactor Use mk-user-name --- .../app/common/views/components/note-header.vue | 2 +- .../app/common/views/components/renote.vue | 2 +- .../common/views/components/welcome-timeline.vue | 2 +- .../app/desktop/views/components/note-detail.vue | 2 +- .../desktop/views/components/notifications.vue | 16 ++++++++-------- .../app/desktop/views/components/post-form.vue | 4 ++-- .../received-follow-requests-window.vue | 2 +- .../desktop/views/components/user-preview.vue | 4 +--- .../views/pages/deck/deck.notification.vue | 10 +++++----- src/client/app/desktop/views/widgets/profile.vue | 4 +--- src/client/app/desktop/views/widgets/users.vue | 4 +--- .../app/mobile/views/components/note-card.vue | 5 ++--- .../app/mobile/views/components/note-detail.vue | 4 +--- .../views/components/notification-preview.vue | 16 ++++++++-------- .../app/mobile/views/components/notification.vue | 10 +++++----- .../app/mobile/views/components/post-form.vue | 2 +- .../app/mobile/views/components/ui.nav.vue | 4 +--- .../views/pages/received-follow-requests.vue | 2 +- src/client/app/mobile/views/widgets/profile.vue | 2 +- 19 files changed, 43 insertions(+), 54 deletions(-) diff --git a/src/client/app/common/views/components/note-header.vue b/src/client/app/common/views/components/note-header.vue index 5204b78a4..664cb308e 100644 --- a/src/client/app/common/views/components/note-header.vue +++ b/src/client/app/common/views/components/note-header.vue @@ -2,7 +2,7 @@ <header class="bvonvjxbwzaiskogyhbwgyxvcgserpmu"> <mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle == 'smart'"/> <router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id"> - <misskey-flavored-markdown :text="note.user.name || note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="note.user.emojis"/> + <mk-user-name :user="note.user"/> </router-link> <span class="is-admin" v-if="note.user.isAdmin">admin</span> <span class="is-bot" v-if="note.user.isBot">bot</span> diff --git a/src/client/app/common/views/components/renote.vue b/src/client/app/common/views/components/renote.vue index 58d0f597c..eae7bd122 100644 --- a/src/client/app/common/views/components/renote.vue +++ b/src/client/app/common/views/components/renote.vue @@ -4,7 +4,7 @@ <fa icon="retweet"/> <i18n path="@.renoted-by" tag="span"> <router-link class="name" :to="note.user | userPage" v-user-preview="note.userId" place="user"> - <misskey-flavored-markdown :text="note.user.name || note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="note.user.emojis"/> + <mk-user-name :user="note.user"/> </router-link> </i18n> <div class="info"> diff --git a/src/client/app/common/views/components/welcome-timeline.vue b/src/client/app/common/views/components/welcome-timeline.vue index f25bc0222..84575b35d 100644 --- a/src/client/app/common/views/components/welcome-timeline.vue +++ b/src/client/app/common/views/components/welcome-timeline.vue @@ -6,7 +6,7 @@ <div class="body"> <header> <router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id"> - <misskey-flavored-markdown :text="note.user.name || note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="note.user.emojis"/> + <mk-user-name :user="note.user"/> </router-link> <span class="username">@{{ note.user | acct }}</span> <div class="info"> diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue index ba537d922..5610c601a 100644 --- a/src/client/app/desktop/views/components/note-detail.vue +++ b/src/client/app/desktop/views/components/note-detail.vue @@ -21,7 +21,7 @@ <mk-avatar class="avatar" :user="appearNote.user"/> <header> <router-link class="name" :to="appearNote.user | userPage" v-user-preview="appearNote.user.id"> - <misskey-flavored-markdown :text="appearNote.user.name || appearNote.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="appearNote.user.emojis"/> + <mk-user-name :user="appearNote.user"/> </router-link> <span class="username"><mk-acct :user="appearNote.user"/></span> <div class="info"> diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue index 47dce22df..4b6577fe6 100644 --- a/src/client/app/desktop/views/components/notifications.vue +++ b/src/client/app/desktop/views/components/notifications.vue @@ -19,7 +19,7 @@ <p> <mk-reaction-icon :reaction="notification.reaction"/> <router-link :to="notification.user | userPage" v-user-preview="notification.user.id"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </router-link> </p> <router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> @@ -33,7 +33,7 @@ <div class="text"> <p><fa icon="retweet"/> <router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId"> - <misskey-flavored-markdown :text="notification.note.user.name || notification.note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.note.user.emojis"/> + <mk-user-name :user="notification.note.user"/> </router-link> </p> <router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)"> @@ -47,7 +47,7 @@ <div class="text"> <p><fa icon="quote-left"/> <router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId"> - <misskey-flavored-markdown :text="notification.note.user.name || notification.note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.note.user.emojis"/> + <mk-user-name :user="notification.note.user"/> </router-link> </p> <router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">{{ getNoteSummary(notification.note) }}</router-link> @@ -59,7 +59,7 @@ <div class="text"> <p><fa icon="user-plus"/> <router-link :to="notification.user | userPage" v-user-preview="notification.user.id"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </router-link> </p> </div> @@ -70,7 +70,7 @@ <div class="text"> <p><fa icon="user-clock"/> <router-link :to="notification.user | userPage" v-user-preview="notification.user.id"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </router-link> </p> </div> @@ -81,7 +81,7 @@ <div class="text"> <p><fa icon="reply"/> <router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId"> - <misskey-flavored-markdown :text="notification.note.user.name || notification.note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.note.user.emojis"/> + <mk-user-name :user="notification.note.user"/> </router-link> </p> <router-link class="note-preview" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">{{ getNoteSummary(notification.note) }}</router-link> @@ -93,7 +93,7 @@ <div class="text"> <p><fa icon="at"/> <router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId"> - <misskey-flavored-markdown :text="notification.note.user.name || notification.note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.note.user.emojis"/> + <mk-user-name :user="notification.note.user"/> </router-link> </p> <a class="note-preview" :href="notification.note | notePage" :title="getNoteSummary(notification.note)">{{ getNoteSummary(notification.note) }}</a> @@ -104,7 +104,7 @@ <mk-avatar class="avatar" :user="notification.user"/> <div class="text"> <p><fa icon="chart-pie"/><a :href="notification.user | userPage" v-user-preview="notification.user.id"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </a></p> <router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> <fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}<fa icon="quote-right"/> diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index 9b1d4fb95..4abd00dab 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -8,8 +8,8 @@ <div class="content"> <div v-if="visibility == 'specified'" class="visibleUsers"> <span v-for="u in visibleUsers"> - <misskey-flavored-markdown :text="u.name || u.username" :shouldBreak="false" :plainText="true" :custom-emojis="u.emojis"/> - <a @click="removeVisibleUser(u)">[x]</a></span> + <mk-user-name :user="u"/><a @click="removeVisibleUser(u)">[x]</a> + </span> <a @click="addVisibleUser">{{ $t('add-visible-user') }}</a> </div> <div class="hashtags" v-if="recentHashtags.length > 0 && $store.state.settings.suggestRecentHashtags"> diff --git a/src/client/app/desktop/views/components/received-follow-requests-window.vue b/src/client/app/desktop/views/components/received-follow-requests-window.vue index 61bddf530..c01a43a4f 100644 --- a/src/client/app/desktop/views/components/received-follow-requests-window.vue +++ b/src/client/app/desktop/views/components/received-follow-requests-window.vue @@ -5,7 +5,7 @@ <div class="slpqaxdoxhvglersgjukmvizkqbmbokc"> <div v-for="req in requests"> <router-link :key="req.id" :to="req.follower | userPage"> - <misskey-flavored-markdown :text="req.follower.name || req.follower.username" :shouldBreak="false" :plainText="true" :custom-emojis="req.follower.emojis"/> + <mk-user-name :user="req.follower"/> </router-link> <span> <a @click="accept(req.follower)">{{ $t('accept') }}</a>|<a @click="reject(req.follower)">{{ $t('reject') }}</a> diff --git a/src/client/app/desktop/views/components/user-preview.vue b/src/client/app/desktop/views/components/user-preview.vue index e1146c25b..44c2593c5 100644 --- a/src/client/app/desktop/views/components/user-preview.vue +++ b/src/client/app/desktop/views/components/user-preview.vue @@ -4,9 +4,7 @@ <div class="banner" :style="u.bannerUrl ? `background-image: url(${u.bannerUrl})` : ''"></div> <mk-avatar class="avatar" :user="u" :disable-preview="true"/> <div class="title"> - <router-link class="name" :to="u | userPage"> - <misskey-flavored-markdown :text="u.name || u.username" :shouldBreak="false" :plainText="true" :custom-emojis="u.emojis"/> - </router-link> + <router-link class="name" :to="u | userPage"><mk-user-name :user="u"/></router-link> <p class="username"><mk-acct :user="u"/></p> </div> <div class="description"> 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 4347d8c12..60cc49080 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notification.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notification.vue @@ -6,7 +6,7 @@ <header> <mk-reaction-icon :reaction="notification.reaction"/> <router-link :to="notification.user | userPage"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </router-link> <mk-time :time="notification.createdAt"/> </header> @@ -23,7 +23,7 @@ <header> <fa icon="retweet"/> <router-link :to="notification.user | userPage"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </router-link> <mk-time :time="notification.createdAt"/> </header> @@ -39,7 +39,7 @@ <header> <fa icon="user-plus"/> <router-link :to="notification.user | userPage"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </router-link> <mk-time :time="notification.createdAt"/> </header> @@ -52,7 +52,7 @@ <header> <fa icon="user-clock"/> <router-link :to="notification.user | userPage"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </router-link> <mk-time :time="notification.createdAt"/> </header> @@ -65,7 +65,7 @@ <header> <fa icon="chart-pie"/> <router-link :to="notification.user | userPage"> - <misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/> + <mk-user-name :user="notification.user"/> </router-link> <mk-time :time="notification.createdAt"/> </header> diff --git a/src/client/app/desktop/views/widgets/profile.vue b/src/client/app/desktop/views/widgets/profile.vue index 1abd655c1..7c841aa8c 100644 --- a/src/client/app/desktop/views/widgets/profile.vue +++ b/src/client/app/desktop/views/widgets/profile.vue @@ -15,9 +15,7 @@ @click="() => os.apis.updateAvatar()" :title="$t('update-avatar')" /> - <router-link class="name" :to="$store.state.i | userPage"> - <misskey-flavored-markdown :text="$store.state.i.name || $store.state.i.username" :shouldBreak="false" :plainText="true" :custom-emojis="$store.state.i.emojis"/> - </router-link> + <router-link class="name" :to="$store.state.i | userPage"><mk-user-name :user="$store.state.i"/></router-link> <p class="username">@{{ $store.state.i | acct }}</p> </div> </mk-widget-container> diff --git a/src/client/app/desktop/views/widgets/users.vue b/src/client/app/desktop/views/widgets/users.vue index cfc1afe14..0530b89d3 100644 --- a/src/client/app/desktop/views/widgets/users.vue +++ b/src/client/app/desktop/views/widgets/users.vue @@ -13,9 +13,7 @@ <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"> - <misskey-flavored-markdown :text="_user.name || _user.username" :shouldBreak="false" :plainText="true" :custom-emojis="_user.emojis"/> - </router-link> + <router-link class="name" :to="_user | userPage" v-user-preview="_user.id"><mk-user-name :user="_user"/></router-link> <p class="username">@{{ _user | acct }}</p> </div> </div> diff --git a/src/client/app/mobile/views/components/note-card.vue b/src/client/app/mobile/views/components/note-card.vue index 013997dd0..43f821085 100644 --- a/src/client/app/mobile/views/components/note-card.vue +++ b/src/client/app/mobile/views/components/note-card.vue @@ -2,9 +2,8 @@ <div class="mk-note-card"> <a :href="note | notePage"> <header> - <img :src="note.user.avatarUrl" alt="avatar"/><h3> - <misskey-flavored-markdown :text="note.user.name || note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="note.user.emojis"/> - </h3> + <img :src="note.user.avatarUrl" alt="avatar"/> + <h3><mk-user-name :user="note.user"/></h3> </header> <div> {{ text }} diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue index e91d66440..330684f01 100644 --- a/src/client/app/mobile/views/components/note-detail.vue +++ b/src/client/app/mobile/views/components/note-detail.vue @@ -20,9 +20,7 @@ <header> <mk-avatar class="avatar" :user="appearNote.user"/> <div> - <router-link class="name" :to="appearNote.user | userPage"> - <misskey-flavored-markdown :text="appearNote.user.name || appearNote.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="appearNote.user.emojis"/> - </router-link> + <router-link class="name" :to="appearNote.user | userPage"><mk-user-name :user="appearNote.user"/></router-link> <span class="username"><mk-acct :user="appearNote.user"/></span> </div> </header> diff --git a/src/client/app/mobile/views/components/notification-preview.vue b/src/client/app/mobile/views/components/notification-preview.vue index 7deee66e7..1b8eceaa6 100644 --- a/src/client/app/mobile/views/components/notification-preview.vue +++ b/src/client/app/mobile/views/components/notification-preview.vue @@ -3,7 +3,7 @@ <template v-if="notification.type == 'reaction'"> <mk-avatar class="avatar" :user="notification.user"/> <div class="text"> - <p><mk-reaction-icon :reaction="notification.reaction"/><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></p> + <p><mk-reaction-icon :reaction="notification.reaction"/><mk-user-name :user="notification.user"/></p> <p class="note-ref"><fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}<fa icon="quote-right"/></p> </div> </template> @@ -11,7 +11,7 @@ <template v-if="notification.type == 'renote'"> <mk-avatar class="avatar" :user="notification.note.user"/> <div class="text"> - <p><fa icon="retweet"/><misskey-flavored-markdown :text="notification.note.user.name || notification.note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.note.user.emojis"/></p> + <p><fa icon="retweet"/><mk-user-name :user="notification.note.user"/></p> <p class="note-ref"><fa icon="quote-left"/>{{ getNoteSummary(notification.note.renote) }}<fa icon="quote-right"/></p> </div> </template> @@ -19,7 +19,7 @@ <template v-if="notification.type == 'quote'"> <mk-avatar class="avatar" :user="notification.note.user"/> <div class="text"> - <p><fa icon="quote-left"/><misskey-flavored-markdown :text="notification.note.user.name || notification.note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.note.user.emojis"/></p> + <p><fa icon="quote-left"/><mk-user-name :user="notification.note.user"/></p> <p class="note-preview">{{ getNoteSummary(notification.note) }}</p> </div> </template> @@ -27,21 +27,21 @@ <template v-if="notification.type == 'follow'"> <mk-avatar class="avatar" :user="notification.user"/> <div class="text"> - <p><fa icon="user-plus"/><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></p> + <p><fa icon="user-plus"/><mk-user-name :user="notification.user"/></p> </div> </template> <template v-if="notification.type == 'receiveFollowRequest'"> <mk-avatar class="avatar" :user="notification.user"/> <div class="text"> - <p><fa icon="user-clock"/><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></p> + <p><fa icon="user-clock"/><mk-user-name :user="notification.user"/></p> </div> </template> <template v-if="notification.type == 'reply'"> <mk-avatar class="avatar" :user="notification.note.user"/> <div class="text"> - <p><fa icon="reply"/><misskey-flavored-markdown :text="notification.note.user.name || notification.note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.note.user.emojis"/></p> + <p><fa icon="reply"/><mk-user-name :user="notification.note.user"/></p> <p class="note-preview">{{ getNoteSummary(notification.note) }}</p> </div> </template> @@ -49,7 +49,7 @@ <template v-if="notification.type == 'mention'"> <mk-avatar class="avatar" :user="notification.note.user"/> <div class="text"> - <p><fa icon="at"/><misskey-flavored-markdown :text="notification.note.user.name || notification.note.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.note.user.emojis"/></p> + <p><fa icon="at"/><mk-user-name :user="notification.note.user"/></p> <p class="note-preview">{{ getNoteSummary(notification.note) }}</p> </div> </template> @@ -57,7 +57,7 @@ <template v-if="notification.type == 'poll_vote'"> <mk-avatar class="avatar" :user="notification.user"/> <div class="text"> - <p><fa icon="chart-pie"/><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></p> + <p><fa icon="chart-pie"/><mk-user-name :user="notification.user"/></p> <p class="note-ref"><fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}<fa icon="quote-right"/></p> </div> </template> diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue index 72cda1b11..a0310abe8 100644 --- a/src/client/app/mobile/views/components/notification.vue +++ b/src/client/app/mobile/views/components/notification.vue @@ -5,7 +5,7 @@ <div> <header> <mk-reaction-icon :reaction="notification.reaction"/> - <router-link :to="notification.user | userPage"><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></router-link> + <router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link> <mk-time :time="notification.createdAt"/> </header> <router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> @@ -20,7 +20,7 @@ <div> <header> <fa icon="retweet"/> - <router-link :to="notification.user | userPage"><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></router-link> + <router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link> <mk-time :time="notification.createdAt"/> </header> <router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)"> @@ -34,7 +34,7 @@ <div> <header> <fa icon="user-plus"/> - <router-link :to="notification.user | userPage"><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></router-link> + <router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link> <mk-time :time="notification.createdAt"/> </header> </div> @@ -45,7 +45,7 @@ <div> <header> <fa icon="user-clock"/> - <router-link :to="notification.user | userPage"><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></router-link> + <router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link> <mk-time :time="notification.createdAt"/> </header> </div> @@ -56,7 +56,7 @@ <div> <header> <fa icon="chart-pie"/> - <router-link :to="notification.user | userPage"><misskey-flavored-markdown :text="notification.user.name || notification.user.username" :shouldBreak="false" :plainText="true" :custom-emojis="notification.user.emojis"/></router-link> + <router-link :to="notification.user | userPage"><mk-user-name :user="notification.user"/></router-link> <mk-time :time="notification.createdAt"/> </header> <router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue index 604e756ad..69858f9ce 100644 --- a/src/client/app/mobile/views/components/post-form.vue +++ b/src/client/app/mobile/views/components/post-form.vue @@ -14,7 +14,7 @@ <mk-note-preview class="preview" v-if="renote" :note="renote"/> <div v-if="visibility == 'specified'" class="visibleUsers"> <span v-for="u in visibleUsers"> - <misskey-flavored-markdown :text="u.name || u.username" :shouldBreak="false" :plainText="true" :custom-emojis="u.emojis"/> + <mk-user-name :user="u"/> <a @click="removeVisibleUser(u)">[x]</a> </span> <a @click="addVisibleUser">+{{ $t('add-visible-user') }}</a> diff --git a/src/client/app/mobile/views/components/ui.nav.vue b/src/client/app/mobile/views/components/ui.nav.vue index 8e79f5565..002f95773 100644 --- a/src/client/app/mobile/views/components/ui.nav.vue +++ b/src/client/app/mobile/views/components/ui.nav.vue @@ -11,9 +11,7 @@ <div class="body" v-if="isOpen"> <router-link class="me" v-if="$store.getters.isSignedIn" :to="`/@${$store.state.i.username}`"> <img class="avatar" :src="$store.state.i.avatarUrl" alt="avatar"/> - <p class="name"> - <misskey-flavored-markdown :text="$store.state.i.name || $store.state.i.username" :shouldBreak="false" :plainText="true" :custom-emojis="$store.state.i.emojis"/> - </p> + <p class="name"><mk-user-name :user="$store.state.i"/></p> </router-link> <div class="links"> <ul> diff --git a/src/client/app/mobile/views/pages/received-follow-requests.vue b/src/client/app/mobile/views/pages/received-follow-requests.vue index 838ed8adb..1b8323e83 100644 --- a/src/client/app/mobile/views/pages/received-follow-requests.vue +++ b/src/client/app/mobile/views/pages/received-follow-requests.vue @@ -5,7 +5,7 @@ <main> <div v-for="req in requests"> <router-link :key="req.id" :to="req.follower | userPage"> - <misskey-flavored-markdown :text="req.follower.name || req.follower.username" :shouldBreak="false" :plainText="true" :custom-emojis="req.follower.emojis"/> + <mk-user-name :user="req.follower"/> </router-link> <span> <a @click="accept(req.follower)">{{ $t('accept') }}</a>|<a @click="reject(req.follower)">{{ $t('reject') }}</a> diff --git a/src/client/app/mobile/views/widgets/profile.vue b/src/client/app/mobile/views/widgets/profile.vue index f6ca793dc..c08cbec7a 100644 --- a/src/client/app/mobile/views/widgets/profile.vue +++ b/src/client/app/mobile/views/widgets/profile.vue @@ -9,7 +9,7 @@ alt="avatar" /> <router-link :class="$style.name" :to="$store.state.i | userPage"> - <misskey-flavored-markdown :text="$store.state.i.name || $store.state.i.username" :shouldBreak="false" :plainText="true" :custom-emojis="$store.state.i.emojis"/> + <mk-user-name :user="$store.state.i"/> </router-link> </mk-widget-container> </div>