summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-04-08 20:56:09 +0900
committerGitHub <noreply@github.com>2018-04-08 20:56:09 +0900
commit2ce9ea2eda1714e70e6a21d6128a87689bb3906c (patch)
treefae5eb623f571b2a5cd82baaa6a5521dc4abed7e /src
parentMerge pull request #1417 from unarist/fix/userpage (diff)
parentFix errors related to getUserName on NoteDetail component (diff)
downloadsharkey-2ce9ea2eda1714e70e6a21d6128a87689bb3906c.tar.gz
sharkey-2ce9ea2eda1714e70e6a21d6128a87689bb3906c.tar.bz2
sharkey-2ce9ea2eda1714e70e6a21d6128a87689bb3906c.zip
Merge pull request #1418 from unarist/fix/note-detail
Fix errors related to getUserName on NoteDetail component
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/components/note-detail.sub.vue2
-rw-r--r--src/client/app/desktop/views/components/note-detail.vue4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/app/desktop/views/components/note-detail.sub.vue b/src/client/app/desktop/views/components/note-detail.sub.vue
index 0159d1ad47..79f5de1f83 100644
--- a/src/client/app/desktop/views/components/note-detail.sub.vue
+++ b/src/client/app/desktop/views/components/note-detail.sub.vue
@@ -6,7 +6,7 @@
<div class="main">
<header>
<div class="left">
- <router-link class="name" :to="`/@${acct}`" v-user-preview="note.userId">{{ getUserName(note.user) }}</router-link>
+ <router-link class="name" :to="`/@${acct}`" v-user-preview="note.userId">{{ name }}</router-link>
<span class="username">@{{ acct }}</span>
</div>
<div class="right">
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index df7c33dfa8..eead82dd04 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -22,7 +22,7 @@
<img class="avatar" :src="`${note.user.avatarUrl}?thumbnail&size=32`" alt="avatar"/>
</router-link>
%fa:retweet%
- <router-link class="name" :href="`/@${acct}`">{{ getUserName(note.user) }}</router-link>
+ <router-link class="name" :href="`/@${acct}`">{{ name }}</router-link>
がRenote
</p>
</div>
@@ -31,7 +31,7 @@
<img class="avatar" :src="`${p.user.avatarUrl}?thumbnail&size=64`" alt="avatar" v-user-preview="p.user.id"/>
</router-link>
<header>
- <router-link class="name" :to="`/@${pAcct}`" v-user-preview="p.user.id">{{ getUserName(p.user) }}</router-link>
+ <router-link class="name" :to="`/@${pAcct}`" v-user-preview="p.user.id">{{ name }}</router-link>
<span class="username">@{{ pAcct }}</span>
<router-link class="time" :to="`/@${pAcct}/${p.id}`">
<mk-time :time="p.createdAt"/>