natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show the correct username

This commit is contained in:
naskya 2023-05-05 09:46:47 +09:00
parent 8bfe67c031
commit 1601676d55
No known key found for this signature in database
GPG Key ID: 164DFF24E2D40139
3 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/client/src/components/MkNote.vue
View File

@ -201,11 +201,27 @@
<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small"> <I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
<template #name> <template #name>
<MkA <MkA
v-user-preview="appearNote.userId" v-user-preview="
['renote', 'quote'].includes(muted.what)
? note.userId
: appearNote.userId
"
class="name" class="name"
:to="userPage(appearNote.user)" :to="
userPage(
['renote', 'quote'].includes(muted.what)
? note.user
: appearNote.user
)
"
> >
<MkUserName :user="appearNote.user" /> <MkUserName
:user="
['renote', 'quote'].includes(muted.what)
? note.user
: appearNote.user
"
/>
</MkA> </MkA>
</template> </template>
<template #reason> <template #reason>
@ -301,9 +317,7 @@ let appearNote = $computed(() =>
const isMyRenote = $i && $i.id === note.userId; const isMyRenote = $i && $i.id === note.userId;
const showContent = ref(false); const showContent = ref(false);
const isDeleted = ref(false); const isDeleted = ref(false);
const muted = ref( const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
);
const translation = ref(null); const translation = ref(null);
const translating = ref(false); const translating = ref(false);
const enableEmojiReactions = defaultStore.state.enableEmojiReactions; const enableEmojiReactions = defaultStore.state.enableEmojiReactions;

26
packages/client/src/components/MkNoteDetailed.vue
View File

@ -42,11 +42,27 @@
<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small"> <I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
<template #name> <template #name>
<MkA <MkA
v-user-preview="appearNote.userId" v-user-preview="
['renote', 'quote'].includes(muted.what)
? note.userId
: appearNote.userId
"
class="name" class="name"
:to="userPage(appearNote.user)" :to="
userPage(
['renote', 'quote'].includes(muted.what)
? note.user
: appearNote.user
)
"
> >
<MkUserName :user="appearNote.user" /> <MkUserName
:user="
['renote', 'quote'].includes(muted.what)
? note.user
: appearNote.user
"
/>
</MkA> </MkA>
</template> </template>
<template #reason> <template #reason>
@ -152,9 +168,7 @@ let appearNote = $computed(() =>
const isMyRenote = $i && $i.id === note.userId; const isMyRenote = $i && $i.id === note.userId;
const showContent = ref(false); const showContent = ref(false);
const isDeleted = ref(false); const isDeleted = ref(false);
const muted = ref( const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
);
const translation = ref(null); const translation = ref(null);
const translating = ref(false); const translating = ref(false);
const urls = appearNote.text const urls = appearNote.text

26
packages/client/src/components/MkNoteSub.vue
View File

@ -166,11 +166,27 @@
<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small"> <I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
<template #name> <template #name>
<MkA <MkA
v-user-preview="appearNote.userId" v-user-preview="
['renote', 'quote'].includes(muted.what)
? note.userId
: appearNote.userId
"
class="name" class="name"
:to="userPage(appearNote.user)" :to="
userPage(
['renote', 'quote'].includes(muted.what)
? note.user
: appearNote.user
)
"
> >
<MkUserName :user="appearNote.user" /> <MkUserName
:user="
['renote', 'quote'].includes(muted.what)
? note.user
: appearNote.user
"
/>
</MkA> </MkA>
</template> </template>
<template #reason> <template #reason>
@ -252,9 +268,7 @@ let appearNote = $computed(() =>
isRenote ? (note.renote as misskey.entities.Note) : note isRenote ? (note.renote as misskey.entities.Note) : note
); );
const isDeleted = ref(false); const isDeleted = ref(false);
const muted = ref( const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
);
const translation = ref(null); const translation = ref(null);
const translating = ref(false); const translating = ref(false);
const replies: misskey.entities.Note[] = const replies: misskey.entities.Note[] =