From 1601676d5525fb484e35af2ca3ada99a8bb7866d Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 5 May 2023 09:46:47 +0900
Subject: [PATCH] Show the correct username

---
 packages/client/src/components/MkNote.vue     | 26 ++++++++++++++-----
 .../client/src/components/MkNoteDetailed.vue  | 26 ++++++++++++++-----
 packages/client/src/components/MkNoteSub.vue  | 26 ++++++++++++++-----
 3 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index c1ab3bf7a3..20b3982db3 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -201,11 +201,27 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="appearNote.userId"
+					v-user-preview="
+						['renote', 'quote'].includes(muted.what)
+							? note.userId
+							: appearNote.userId
+					"
 					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>
 			</template>
 			<template #reason>
@@ -301,9 +317,7 @@ let appearNote = $computed(() =>
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(
-	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
-);
+const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 84dc4c083c..1618300930 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -42,11 +42,27 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="appearNote.userId"
+					v-user-preview="
+						['renote', 'quote'].includes(muted.what)
+							? note.userId
+							: appearNote.userId
+					"
 					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>
 			</template>
 			<template #reason>
@@ -152,9 +168,7 @@ let appearNote = $computed(() =>
 const isMyRenote = $i && $i.id === note.userId;
 const showContent = ref(false);
 const isDeleted = ref(false);
-const muted = ref(
-	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
-);
+const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const urls = appearNote.text
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 89aca59e0f..29416f378a 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -166,11 +166,27 @@
 		<I18n :src="softMuteReasonI18nSrc(muted.what)" tag="small">
 			<template #name>
 				<MkA
-					v-user-preview="appearNote.userId"
+					v-user-preview="
+						['renote', 'quote'].includes(muted.what)
+							? note.userId
+							: appearNote.userId
+					"
 					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>
 			</template>
 			<template #reason>
@@ -252,9 +268,7 @@ let appearNote = $computed(() =>
 	isRenote ? (note.renote as misskey.entities.Note) : note
 );
 const isDeleted = ref(false);
-const muted = ref(
-	getWordSoftMute(appearNote, $i, defaultStore.state.mutedWords)
-);
+const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const replies: misskey.entities.Note[] =