From 3b6d1cb4d81b96c4edce8e97fdd06816e9835bee Mon Sep 17 00:00:00 2001
From: Lilia <lilia@lirisia.net>
Date: Sun, 6 Apr 2025 22:11:37 +0900
Subject: [PATCH 1/3] Fix: Prevent UI corruption from Unicode control
 characters in usernames

---
 packages/frontend-embed/src/components/EmNote.vue         | 4 +++-
 packages/frontend-embed/src/components/EmNoteDetailed.vue | 4 +++-
 packages/frontend/src/components/MkNote.vue               | 4 +++-
 packages/frontend/src/components/MkNoteDetailed.vue       | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/frontend-embed/src/components/EmNote.vue b/packages/frontend-embed/src/components/EmNote.vue
index f5b064c293..2eaf0633cf 100644
--- a/packages/frontend-embed/src/components/EmNote.vue
+++ b/packages/frontend-embed/src/components/EmNote.vue
@@ -21,7 +21,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<I18n :src="i18n.ts.renotedBy" tag="span" :class="$style.renoteText">
 			<template #user>
 				<EmA :class="$style.renoteUserName" :to="userPage(note.user)">
-					<EmUserName :user="note.user"/>
+					<span style="unicode-bidi: plaintext; display: inline-block;">
+						<EmUserName :user="note.user"/>
+					</span>
 				</EmA>
 			</template>
 		</I18n>
diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue
index b39b47c065..6ae69ef6bc 100644
--- a/packages/frontend-embed/src/components/EmNoteDetailed.vue
+++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue
@@ -17,7 +17,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<I18n :src="i18n.ts.renotedBy" tag="span">
 				<template #user>
 					<EmA :class="$style.renoteName" :to="userPage(note.user)">
-						<EmUserName :user="note.user"/>
+						<span style="unicode-bidi: plaintext; display: inline-block;">
+							<EmUserName :user="note.user"/>
+						</span>
 					</EmA>
 				</template>
 			</I18n>
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index ab70a11b9b..d409a1edaf 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -21,7 +21,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<I18n :src="i18n.ts.renotedBy" tag="span" :class="$style.renoteText">
 			<template #user>
 				<MkA v-user-preview="note.userId" :class="$style.renoteUserName" :to="userPage(note.user)">
-					<MkUserName :user="note.user"/>
+					<span style="unicode-bidi: plaintext; display: inline-block;">
+						<MkUserName :user="note.user"/>
+					</span>
 				</MkA>
 			</template>
 		</I18n>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index a26eb808e4..fde2055cd1 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span :class="$style.renoteText">
 			<I18n :src="i18n.ts.renotedBy" tag="span">
 				<template #user>
-					<MkA v-user-preview="note.userId" :class="$style.renoteName" :to="userPage(note.user)">
+					<MkA v-user-preview="note.userId" :class="$style.renoteName" :to="userPage(note.user)" style="unicode-bidi: plaintext; display: inline-block;">
 						<MkUserName :user="note.user"/>
 					</MkA>
 				</template>

From acff4763b91fa1b4555fe8783d1b84e7140b7c7d Mon Sep 17 00:00:00 2001
From: Lilia <lilia@lirisia.net>
Date: Sun, 6 Apr 2025 23:20:42 +0900
Subject: [PATCH 2/3] Revert "Fix: Prevent UI corruption from Unicode control
 characters in usernames"

This reverts commit 7aad471b011d99064e1019416df79e63d90ab488.
---
 packages/frontend-embed/src/components/EmNote.vue         | 4 +---
 packages/frontend-embed/src/components/EmNoteDetailed.vue | 4 +---
 packages/frontend/src/components/MkNote.vue               | 4 +---
 packages/frontend/src/components/MkNoteDetailed.vue       | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/frontend-embed/src/components/EmNote.vue b/packages/frontend-embed/src/components/EmNote.vue
index 2eaf0633cf..f5b064c293 100644
--- a/packages/frontend-embed/src/components/EmNote.vue
+++ b/packages/frontend-embed/src/components/EmNote.vue
@@ -21,9 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<I18n :src="i18n.ts.renotedBy" tag="span" :class="$style.renoteText">
 			<template #user>
 				<EmA :class="$style.renoteUserName" :to="userPage(note.user)">
-					<span style="unicode-bidi: plaintext; display: inline-block;">
-						<EmUserName :user="note.user"/>
-					</span>
+					<EmUserName :user="note.user"/>
 				</EmA>
 			</template>
 		</I18n>
diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue
index 6ae69ef6bc..b39b47c065 100644
--- a/packages/frontend-embed/src/components/EmNoteDetailed.vue
+++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue
@@ -17,9 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<I18n :src="i18n.ts.renotedBy" tag="span">
 				<template #user>
 					<EmA :class="$style.renoteName" :to="userPage(note.user)">
-						<span style="unicode-bidi: plaintext; display: inline-block;">
-							<EmUserName :user="note.user"/>
-						</span>
+						<EmUserName :user="note.user"/>
 					</EmA>
 				</template>
 			</I18n>
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index d409a1edaf..ab70a11b9b 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -21,9 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<I18n :src="i18n.ts.renotedBy" tag="span" :class="$style.renoteText">
 			<template #user>
 				<MkA v-user-preview="note.userId" :class="$style.renoteUserName" :to="userPage(note.user)">
-					<span style="unicode-bidi: plaintext; display: inline-block;">
-						<MkUserName :user="note.user"/>
-					</span>
+					<MkUserName :user="note.user"/>
 				</MkA>
 			</template>
 		</I18n>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index fde2055cd1..a26eb808e4 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span :class="$style.renoteText">
 			<I18n :src="i18n.ts.renotedBy" tag="span">
 				<template #user>
-					<MkA v-user-preview="note.userId" :class="$style.renoteName" :to="userPage(note.user)" style="unicode-bidi: plaintext; display: inline-block;">
+					<MkA v-user-preview="note.userId" :class="$style.renoteName" :to="userPage(note.user)">
 						<MkUserName :user="note.user"/>
 					</MkA>
 				</template>

From 3eb8264de514d4d8c6abf4ce1cbf367e105334ae Mon Sep 17 00:00:00 2001
From: Lilia <lilia@lirisia.net>
Date: Sun, 6 Apr 2025 23:23:30 +0900
Subject: [PATCH 3/3] Fix: Incorporate Unicode control character protection
 directly in username components

---
 packages/frontend-embed/src/components/EmUserName.vue  | 4 +++-
 packages/frontend/src/components/global/MkUserName.vue | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/frontend-embed/src/components/EmUserName.vue b/packages/frontend-embed/src/components/EmUserName.vue
index c0c7c443ca..0132b43714 100644
--- a/packages/frontend-embed/src/components/EmUserName.vue
+++ b/packages/frontend-embed/src/components/EmUserName.vue
@@ -4,7 +4,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<EmMfm :text="user.name ?? user.username" :author="user" :plain="true" :nowrap="nowrap" :emojiUrls="user.emojis"/>
+<span style="unicode-bidi: plaintext; display: inline-block;">
+	<EmMfm :text="user.name ?? user.username" :author="user" :plain="true" :nowrap="nowrap" :emojiUrls="user.emojis"/>
+</span>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/frontend/src/components/global/MkUserName.vue b/packages/frontend/src/components/global/MkUserName.vue
index c5bcf53102..c32799c057 100644
--- a/packages/frontend/src/components/global/MkUserName.vue
+++ b/packages/frontend/src/components/global/MkUserName.vue
@@ -4,7 +4,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<Mfm :text="user.name ?? user.username" :author="user" :plain="true" :nowrap="nowrap" :emojiUrls="user.emojis"/>
+<span style="unicode-bidi: plaintext; display: inline-block;">
+	<Mfm :text="user.name ?? user.username" :author="user" :plain="true" :nowrap="nowrap" :emojiUrls="user.emojis"/>
+</span>
 </template>
 
 <script lang="ts" setup>