feat(frontend): GTL上でのサーバー表示をインスタンスのロゴのみに切り替えできるように

locales/index.d.ts

@@ -2840,6 +2840,10 @@ export interface Locale extends ILocale {
      * ノートのサーバー情報
      */
     "instanceTicker": string;
+    /**
+     * サーバー情報をアイコンのみにする
+     */
+    "instanceIcon": string;
     /**
      * {x}を待っています
      */

locales/ja-JP.yml

@@ -706,6 +706,7 @@ openInSideView: "サイドビューで開く"
 defaultNavigationBehaviour: "デフォルトのナビゲーション"
 editTheseSettingsMayBreakAccount: "これらの設定を編集するとアカウントが破損する可能性があります。"
 instanceTicker: "ノートのサーバー情報"
+instanceIcon: "サーバー情報をアイコンのみにする"
 waitingFor: "{x}を待っています"
 random: "ランダム"
 system: "システム"

packages/frontend/src/components/MkInstanceIcon.vue

@@ -0,0 +1,56 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div>
+	<img v-if="faviconUrl" :class="$style.topleftIcon" :src="faviconUrl"/>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { getProxiedImageUrlNullable } from '@/scripts/media-proxy.js';
+
+const props = defineProps<{
+	instance?: {
+		faviconUrl?: string | null
+	}
+}>();
+
+const faviconUrl = computed(() => getProxiedImageUrlNullable(props.instance?.faviconUrl, 'preview') ?? '/favicon.ico');
+
+</script>
+
+<style lang="scss" module>
+.topleftIcon {
+	width: 25px;
+	height: 25px;
+	border-radius: 50%;
+	opacity: 0.7;
+	background: var(--panel);
+	box-shadow: 0 0 0 2px var(--panel);
+}
+
+@container (max-width: 580px) {
+	.topleftIcon {
+		width: 21px;
+		height: 21px;
+	}
+}
+
+@container (max-width: 450px) {
+	.topleftIcon {
+		width: 19px;
+		height: 19px;
+	}
+}
+
+@container (max-width: 300px) {
+	.topleftIcon {
+		width: 17px;
+		height: 17px;
+	}
+}
+</style>

packages/frontend/src/components/MkNote.vue

@@ -47,10 +47,11 @@ 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>
+		<MkInstanceIcon v-if="showInstanceIcon && showTicker" :class="$style.instanceicon"/>
 		<MkAvatar :class="$style.avatar" :user="appearNote.user" :link="!mock" :preview="!mock"/>
 		<div :class="$style.main">
 			<MkNoteHeader :note="appearNote" :mini="true"/>
-			<MkInstanceTicker v-if="showTicker" :instance="appearNote.user.instance"/>
+			<MkInstanceTicker v-if="showTicker && !showInstanceIcon" :instance="appearNote.user.instance"/>
 			<div style="container-type: inline-size;">
 				<p v-if="appearNote.cw != null" :class="$style.cw">
 					<Mfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'"/>
@@ -174,6 +175,7 @@ import MkPoll from '@/components/MkPoll.vue';
 import MkUsersTooltip from '@/components/MkUsersTooltip.vue';
 import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
+import MkInstanceIcon from '@/components/MkInstanceIcon.vue';
 import { pleaseLogin } from '@/scripts/please-login.js';
 import { focusPrev, focusNext } from '@/scripts/focus.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
@@ -267,6 +269,7 @@ const muted = ref(checkMute(appearNote.value, $i?.mutedWords));
 const hardMuted = ref(props.withHardMute && checkMute(appearNote.value, $i?.hardMutedWords, true));
 const translation = ref<Misskey.entities.NotesTranslateResponse | null>(null);
 const translating = ref(false);
+const showInstanceIcon = ref(defaultStore.state.instanceIcon);
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && 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(
@@ -783,6 +786,16 @@ function emitUpdReaction(emoji: string, delta: number) {
 	left: 0;
 }
 
+.instanceicon {
+	display: block !important;
+	padding-top: 33px;
+	margin-right: -25px;
+	height: 25px;
+	z-index: 10;
+	position: sticky !important;
+	top: calc(22px + var(--stickyTop, 0px));
+}
+
 .main {
 	flex: 1;
 	min-width: 0;
@@ -923,6 +936,12 @@ function emitUpdReaction(emoji: string, delta: number) {
 		width: 50px;
 		height: 50px;
 	}
+
+	.instanceicon {
+		padding-top: 29px;
+		height: 21px;
+		margin-right: -21px;
+	}
 }
 
 @container (max-width: 500px) {
@@ -938,6 +957,10 @@ function emitUpdReaction(emoji: string, delta: number) {
 		padding: 20px 22px;
 	}
 
+	.instanceicon {
+		top: calc(14px + var(--stickyTop, 0px));
+	}
+
 	.footer {
 		margin-bottom: -8px;
 	}
@@ -969,6 +992,12 @@ function emitUpdReaction(emoji: string, delta: number) {
 		height: 46px;
 		top: calc(14px + var(--stickyTop, 0px));
 	}
+
+	.instanceicon {
+		padding-top: 27px;
+		height: 19px;
+		margin-right: -19px;
+	}
 }
 
 @container (max-width: 400px) {
@@ -979,6 +1008,11 @@ function emitUpdReaction(emoji: string, delta: number) {
 			}
 		}
 	}
+
+	.instanceicon {
+		height: 17px;
+		margin-right: -17px;
+	}
 }
 
 @container (max-width: 350px) {

packages/frontend/src/pages/settings/general.vue

@@ -47,7 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<FormSection>
 		<template #label>{{ i18n.ts.displayOfNote }}</template>
-
+		
 		<div class="_gaps_m">
 			<div class="_gaps_s">
 				<MkSwitch v-model="collapseRenotes">
@@ -77,7 +77,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<option value="remote">{{ i18n.ts._instanceTicker.remote }}</option>
 				<option value="always">{{ i18n.ts._instanceTicker.always }}</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>
@@ -301,6 +301,7 @@ 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'));
@@ -348,6 +349,7 @@ watch([
 	showNoteActionsOnlyHover,
 	showGapBetweenNotesInTimeline,
 	instanceTicker,
+	instanceIcon,
 	overridedDeviceKind,
 	mediaListWithOneImageAppearance,
 	reactionsDisplaySize,

packages/frontend/src/store.ts

@@ -290,6 +290,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: 'remote' as 'none' | 'remote' | 'always',
 	},
+	instanceIcon: {
+		where: 'device',
+		default: false,
+	},
 	emojiPickerScale: {
 		where: 'device',
 		default: 1,