From 6a8aacfb95b0429f8332bfa80166823de181e328 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 31 May 2026 17:07:39 +0900
Subject: [PATCH] wip

---
 locales/ja-JP.yml                                    |  3 +++
 packages/frontend/src/pages/rooms/room.core.vue      |  2 +-
 packages/frontend/src/pages/settings/preferences.vue | 10 ----------
 packages/frontend/src/pages/settings/profile.vue     | 11 +++++++++++
 packages/i18n/src/autogen/locale.ts                  |  8 ++++++++
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 64e59dc763..6a28be1683 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -3559,6 +3559,9 @@ _qr:
   raw: "テキスト"
   mfm: "MFM"
 
+threeDAvatar: "3Dアバター"
+threeDAvatar_description: "MisskeyWorld / MisskeyRoomsで使用可能なアバターを作成できます。"
+
 _miWorld:
   separateRenderingThread: "描画を別スレッドに分離"
   separateRenderingThread_description: "有効にするとパフォーマンスが向上します。不安定になる場合は無効すると改善する可能性があります。"
diff --git a/packages/frontend/src/pages/rooms/room.core.vue b/packages/frontend/src/pages/rooms/room.core.vue
index 42d031028d..1cdedd9a60 100644
--- a/packages/frontend/src/pages/rooms/room.core.vue
+++ b/packages/frontend/src/pages/rooms/room.core.vue
@@ -133,7 +133,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 	</XOverlayPanel>
 
-	<XOverlayPanel v-if="isPlayerInfoOpen && pointedPlayerInfo != null" :isNarrow="isNarrow" :title="room.name" @close="isPlayerInfoOpen = false">
+	<XOverlayPanel v-if="isPlayerInfoOpen && pointedPlayerInfo != null" :isNarrow="isNarrow" :title="pointedPlayerInfo.user != null ? (pointedPlayerInfo.user?.name ?? pointedPlayerInfo.user?.username) : '(anonymous)'" @close="isPlayerInfoOpen = false">
 		<template #icon>
 			<i class="ti ti-user"></i>
 		</template>
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index ececc4d0e9..a3f3fd078b 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -823,15 +823,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 								</MkSwitch>
 							</MkPreferenceContainer>
 						</SearchMarker>
-
-						<SearchMarker :keywords="['avatar']">
-							<MkFolder>
-								<template #icon><i class="ti ti-user"></i></template>
-								<template #label><SearchLabel>{{ i18n.ts._miWorld.avatar }}</SearchLabel></template>
-
-								<MkWorldAvatarManager/>
-							</MkFolder>
-						</SearchMarker>
 					</div>
 				</MkFolder>
 			</SearchMarker>
@@ -966,7 +957,6 @@ import MkDisableSection from '@/components/MkDisableSection.vue';
 import FormLink from '@/components/form/link.vue';
 import MkLink from '@/components/MkLink.vue';
 import MkInfo from '@/components/MkInfo.vue';
-import MkWorldAvatarManager from '@/components/MkWorldAvatarManager.vue';
 import { store } from '@/store.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index 966a130955..60a9aca565 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -151,6 +151,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 		<hr>
 
+		<SearchMarker :keywords="['world', 'rooms', 'avatar', '3d']">
+			<MkFolder>
+				<template #icon><i class="ti ti-box"></i></template>
+				<template #label><SearchLabel>{{ i18n.ts.threeDAvatar }}</SearchLabel></template>
+				<template #caption>{{ i18n.ts.threeDAvatar_description }}</template>
+
+				<MkWorldAvatarManager/>
+			</MkFolder>
+		</SearchMarker>
+
 		<SearchMarker :keywords="['qrcode']">
 			<FormLink to="/qr">
 				<template #icon><i class="ti ti-qrcode"></i></template>
@@ -184,6 +194,7 @@ import { store } from '@/store.js';
 import MkInfo from '@/components/MkInfo.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
 import { genId } from '@/utility/id.js';
+import MkWorldAvatarManager from '@/components/MkWorldAvatarManager.vue';
 
 const $i = ensureSignin();
 
diff --git a/packages/i18n/src/autogen/locale.ts b/packages/i18n/src/autogen/locale.ts
index 1bb4de0ac7..94ddc516c5 100644
--- a/packages/i18n/src/autogen/locale.ts
+++ b/packages/i18n/src/autogen/locale.ts
@@ -13282,6 +13282,14 @@ export interface Locale extends ILocale {
          */
         "mfm": string;
     };
+    /**
+     * 3Dアバター
+     */
+    "threeDAvatar": string;
+    /**
+     * MisskeyWorld / MisskeyRoomsで使用可能なアバターを作成できます。
+     */
+    "threeDAvatar_description": string;
     "_miWorld": {
         /**
          * 描画を別スレッドに分離