graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-24 15:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1418 from unarist/fix/note-detail

Browse source 
Fix errors related to getUserName on NoteDetail component
This commit is contained in:
syuilo 2018-04-08 20:56:09 +09:00 committed by GitHub
commit 2ce9ea2eda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/app/desktop/views/components/note-detail.sub.vue
View file

@ -6,7 +6,7 @@
<div class="main"> <div class="main">
<header> <header>
<div class="left"> <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> <span class="username">@{{ acct }}</span>
</div> </div>
<div class="right"> <div class="right">

4
src/client/app/desktop/views/components/note-detail.vue
View file

@ -22,7 +22,7 @@
<img class="avatar" :src="`${note.user.avatarUrl}?thumbnail&size=32`" alt="avatar"/> <img class="avatar" :src="`${note.user.avatarUrl}?thumbnail&size=32`" alt="avatar"/>
</router-link> </router-link>
%fa:retweet% %fa:retweet%
<router-link class="name" :href="`/@${acct}`">{{ getUserName(note.user) }}</router-link> <router-link class="name" :href="`/@${acct}`">{{ name }}</router-link>
がRenote がRenote
</p> </p>
</div> </div>
@ -31,7 +31,7 @@
<img class="avatar" :src="`${p.user.avatarUrl}?thumbnail&size=64`" alt="avatar" v-user-preview="p.user.id"/> <img class="avatar" :src="`${p.user.avatarUrl}?thumbnail&size=64`" alt="avatar" v-user-preview="p.user.id"/>
</router-link> </router-link>
<header> <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> <span class="username">@{{ pAcct }}</span>
<router-link class="time" :to="`/@${pAcct}/${p.id}`"> <router-link class="time" :to="`/@${pAcct}/${p.id}`">
<mk-time :time="p.createdAt"/> <mk-time :time="p.createdAt"/>