From 8c1dfab1958c1d3e1e951c467240684ce5fc27e0 Mon Sep 17 00:00:00 2001
From: MattyaDaihuku <edamame051012@gmail.com>
Date: Sun, 3 Nov 2024 06:11:04 +0000
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20MkSelect=E3=81=ABinstanceIcon?=
 =?UTF-8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92=E5=90=AB=E3=82=81=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                                   | 12 ++++++++----
 locales/ja-JP.yml                                    |  3 ++-
 packages/frontend/src/components/MkNote.vue          |  6 +++---
 packages/frontend/src/components/global/MkAvatar.vue |  2 +-
 packages/frontend/src/pages/settings/general.vue     |  6 +++---
 packages/frontend/src/store.ts                       |  6 +-----
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 653caef534..cb03dee518 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2922,10 +2922,6 @@ export interface Locale extends ILocale {
      * ノートのサーバー情報
      */
     "instanceTicker": string;
-    /**
-     * サーバー情報をアイコンのみにする
-     */
-    "instanceIcon": string;
     /**
      * {x}を待っています
      */
@@ -7450,6 +7446,14 @@ export interface Locale extends ILocale {
          * 常に表示
          */
         "always": string;
+        /**
+         * リモートユーザーに表示(アイコンのみ)
+         */
+        "remoteIcon": string;
+        /**
+         * 常に表示(アイコンのみ)
+         */
+        "alwaysIcon": string;
     };
     "_serverDisconnectedBehavior": {
         /**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 4221b9f971..87f1db030d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -726,7 +726,6 @@ openInSideView: "サイドビューで開く"
 defaultNavigationBehaviour: "デフォルトのナビゲーション"
 editTheseSettingsMayBreakAccount: "これらの設定を編集するとアカウントが破損する可能性があります。"
 instanceTicker: "ノートのサーバー情報"
-instanceIcon: "サーバー情報をアイコンのみにする"
 waitingFor: "{x}を待っています"
 random: "ランダム"
 system: "システム"
@@ -1945,6 +1944,8 @@ _instanceTicker:
   none: "表示しない"
   remote: "リモートユーザーに表示"
   always: "常に表示"
+  remoteIcon: "リモートユーザーに表示(アイコンのみ)"
+  alwaysIcon: "常に表示(アイコンのみ)"
 
 _serverDisconnectedBehavior:
   reload: "自動でリロード"
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 294856afac..0f6a23cadc 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -47,10 +47,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</div>
 	<article v-else :class="$style.article" @contextmenu.stop="onContextmenu">
 		<div v-if="appearNote.channel" :class="$style.colorBar" :style="{ background: appearNote.channel.color }"></div>
-		<MkAvatar :class="$style.avatar" :user="appearNote.user" :link="!mock" :preview="!mock" :showInstance="!!showInstanceIcon && !!showTicker"/>
+		<MkAvatar :class="$style.avatar" :user="appearNote.user" :link="!mock" :preview="!mock" :showInstance="showInstanceIcon"/>
 		<div :class="$style.main">
 			<MkNoteHeader :note="appearNote" :mini="true"/>
-			<MkInstanceTicker v-if="showTicker && !showInstanceIcon" :instance="appearNote.user.instance"/>
+			<MkInstanceTicker v-if="showTicker" :instance="appearNote.user.instance"/>
 			<div style="container-type: inline-size;">
 				<p v-if="appearNote.cw != null" :class="$style.cw">
 					<Mfm
@@ -274,7 +274,7 @@ const hardMuted = ref(props.withHardMute && checkMute(appearNote.value, $i?.hard
 const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
 const translating = ref(false);
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.value.user.instance);
-const showInstanceIcon = ref(defaultStore.state.instanceIcon);
+const showInstanceIcon = (defaultStore.state.instanceTicker === 'alwaysIcon') || (defaultStore.state.instanceTicker === 'remoteIcon' && appearNote.value.user.instance);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id));
 const renoteCollapsed = ref(
 	defaultStore.state.collapseRenotes && isRenote && (
diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue
index 13c39a5f29..b4aba8fa7f 100644
--- a/packages/frontend/src/components/global/MkAvatar.vue
+++ b/packages/frontend/src/components/global/MkAvatar.vue
@@ -35,8 +35,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 			}"
 			alt=""
 		>
-		<MkInstanceIcon v-if="showInstance" :class="$style.instanceicon" :instance="user.instance"/>
 	</template>
+	<MkInstanceIcon v-if="showInstance" :class="$style.instanceicon" :instance="user.instance"/>
 </component>
 </template>
 
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 84d5784d45..617b6968f8 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -69,8 +69,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="none">{{ i18n.ts._instanceTicker.none }}</option>
 				<option value="remote">{{ i18n.ts._instanceTicker.remote }}</option>
 				<option value="always">{{ i18n.ts._instanceTicker.always }}</option>
+				<option value="remoteIcon">{{ i18n.ts._instanceTicker.remoteIcon }}</option>
+				<option value="alwaysIcon">{{ i18n.ts._instanceTicker.alwaysIcon }}</option>
 			</MkSelect>
-			<MkSwitch v-if="instanceTicker !== 'none'" v-model="instanceIcon">{{ i18n.ts.instanceIcon }}</MkSwitch>
+
 			<MkSelect v-model="nsfw">
 				<template #label>{{ i18n.ts.displayOfSensitiveMedia }}</template>
 				<option value="respect">{{ i18n.ts._displayOfSensitiveMedia.respect }}</option>
@@ -304,7 +306,6 @@ const showFixedPostForm = computed(defaultStore.makeGetterSetter('showFixedPostF
 const showFixedPostFormInChannel = computed(defaultStore.makeGetterSetter('showFixedPostFormInChannel'));
 const numberOfPageCache = computed(defaultStore.makeGetterSetter('numberOfPageCache'));
 const instanceTicker = computed(defaultStore.makeGetterSetter('instanceTicker'));
-const instanceIcon = computed(defaultStore.makeGetterSetter('instanceIcon'));
 const enableInfiniteScroll = computed(defaultStore.makeGetterSetter('enableInfiniteScroll'));
 const useReactionPickerForContextMenu = computed(defaultStore.makeGetterSetter('useReactionPickerForContextMenu'));
 const squareAvatars = computed(defaultStore.makeGetterSetter('squareAvatars'));
@@ -354,7 +355,6 @@ watch([
 	showNoteActionsOnlyHover,
 	showGapBetweenNotesInTimeline,
 	instanceTicker,
-	instanceIcon,
 	overridedDeviceKind,
 	mediaListWithOneImageAppearance,
 	reactionsDisplaySize,
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index d35a3ae54d..c90b66a65d 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -294,11 +294,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	instanceTicker: {
 		where: 'device',
-		default: 'remote' as 'none' | 'remote' | 'always',
-	},
-	instanceIcon: {
-		where: 'device',
-		default: false,
+		default: 'remote' as 'none' | 'remote' | 'always' | 'remoteIcon' | 'alwaysIcon',
 	},
 	emojiPickerScale: {
 		where: 'device',