From a27d17f34df02d81438d295de57db6dc0ea29224 Mon Sep 17 00:00:00 2001
From: taiyme <53635909+taiyme@users.noreply.github.com>
Date: Mon, 11 Nov 2024 22:05:22 +0900
Subject: [PATCH] enhance(tms): /tms/settings -> /tms/features

---
 locales/index.d.ts                            |  54 ++-------
 locales/ja-JP.yml                             |  20 +---
 .../src/components/TmsSoftwareDonation.vue    |   2 +-
 packages/frontend/src/pages/tms/about.vue     |   4 +-
 .../frontend/src/pages/tms/features.form.vue  | 106 +++++++++++++++++
 packages/frontend/src/pages/tms/features.vue  |  38 ++++++
 .../src/pages/tms/flags/index.main.vue        | 110 ------------------
 .../frontend/src/pages/tms/flags/index.vue    |  67 -----------
 .../src/pages/tms/settings/index.main.vue     | 108 -----------------
 .../frontend/src/pages/tms/settings/index.vue |  62 ----------
 packages/frontend/src/router/definition.ts    |  10 +-
 packages/frontend/src/style.scss              |   4 +
 packages/frontend/src/ui/_common_/common.ts   |   4 +-
 13 files changed, 173 insertions(+), 416 deletions(-)
 create mode 100644 packages/frontend/src/pages/tms/features.form.vue
 create mode 100644 packages/frontend/src/pages/tms/features.vue
 delete mode 100644 packages/frontend/src/pages/tms/flags/index.main.vue
 delete mode 100644 packages/frontend/src/pages/tms/flags/index.vue
 delete mode 100644 packages/frontend/src/pages/tms/settings/index.main.vue
 delete mode 100644 packages/frontend/src/pages/tms/settings/index.vue

diff --git a/locales/index.d.ts b/locales/index.d.ts
index e0e4a649bdf8..143644ac1fe1 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -10485,29 +10485,25 @@ export interface Locale extends ILocale {
          */
         readonly "aboutTaiyme": string;
         /**
-         * taiyme拡張機能
+         * taiyme限定機能
          */
-        readonly "taiymeSettings": string;
+        readonly "taiymeFeatures": string;
         /**
-         * taiyme実験的機能
+         * これらの機能はtaiymeで独自実装したものです。
          */
-        readonly "taiymeFlags": string;
+        readonly "taiymeFeaturesDescription": string;
         /**
          * {name}は、Misskeyの派生であるtaiymeを使用したサーバーのひとつです。
          */
         readonly "poweredByTaiyme": ParameterizedString<"name">;
         /**
-         * {name}を支援
+         * taiyを支援する
          */
-        readonly "supportX": ParameterizedString<"name">;
+        readonly "supportTaiy": string;
         /**
          * コミットハッシュ
          */
         readonly "commitHash": string;
-        /**
-         * 問題の報告や要望はGitHubで受け付けています。
-         */
-        readonly "reportIssuesToGithub": string;
         /**
          * センシティブな画像
          */
@@ -10573,14 +10569,10 @@ export interface Locale extends ILocale {
          */
         readonly "updatedX": ParameterizedString<"x">;
         readonly "_about": {
-            /**
-             * taiymeについて
-             */
-            readonly "title": string;
             /**
              * taiymeは、Misskeyから派生したオープンソースのソフトウェアです。
              */
-            readonly "description": string;
+            readonly "taiymeIsOSS": string;
             /**
              * プロジェクトメンバー
              */
@@ -10594,15 +10586,7 @@ export interface Locale extends ILocale {
              */
             readonly "patrons": string;
         };
-        readonly "_settings": {
-            /**
-             * taiyme拡張機能
-             */
-            readonly "title": string;
-            /**
-             * これらの機能はtaiymeで独自実装したものです。
-             */
-            readonly "description": string;
+        readonly "_features": {
             readonly "_tickerPosition": {
                 /**
                  * ノートのサーバー情報の表示位置
@@ -10683,28 +10667,6 @@ export interface Locale extends ILocale {
                  */
                 readonly "caption": string;
             };
-        };
-        readonly "_flags": {
-            /**
-             * taiyme実験的機能
-             */
-            readonly "title": string;
-            /**
-             * これらの機能はtaiymeで独自実装したものです。
-             */
-            readonly "description": string;
-            /**
-             * これらの設定を有効にすると、ページの表示や挙動に深刻な影響を及ぼし、{name}が正常に利用できなくなる可能性があります。
-             */
-            readonly "warning": ParameterizedString<"name">;
-            /**
-             * {x}を強制取得
-             */
-            readonly "forceFetchX": ParameterizedString<"x">;
-            /**
-             * {x}を開く
-             */
-            readonly "openX": ParameterizedString<"x">;
             readonly "_preventLongPressContextMenu": {
                 /**
                  * 長押しによるコンテキストメニューイベントの発行を防ぐ
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 26b7c5c742fc..6060c105f0c6 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2794,12 +2794,11 @@ _tms:
   taiy: "taiy"
   taiyme: "taiyme"
   aboutTaiyme: "taiymeについて"
-  taiymeSettings: "taiyme拡張機能"
-  taiymeFlags: "taiyme実験的機能"
+  taiymeFeatures: "taiyme限定機能"
+  taiymeFeaturesDescription: "これらの機能はtaiymeで独自実装したものです。"
   poweredByTaiyme: "{name}は、Misskeyの派生であるtaiymeを使用したサーバーのひとつです。"
-  supportX: "{name}を支援"
+  supportTaiy: "taiyを支援する"
   commitHash: "コミットハッシュ"
-  reportIssuesToGithub: "問題の報告や要望はGitHubで受け付けています。"
   sensitiveImage: "センシティブな画像"
   sensitiveVideo: "センシティブな動画"
   sensitiveAudio: "センシティブな音声"
@@ -2817,14 +2816,11 @@ _tms:
   taiymeUpdated: "taiymeが更新されました！"
   updatedX: "{x}が更新されました！"
   _about:
-    title: "taiymeについて"
-    description: "taiymeは、Misskeyから派生したオープンソースのソフトウェアです。"
+    taiymeIsOSS: "taiymeは、Misskeyから派生したオープンソースのソフトウェアです。"
     projectMembers: "プロジェクトメンバー"
     contributors: "コントリビューター"
     patrons: "支援者"
-  _settings:
-    title: "taiyme拡張機能"
-    description: "これらの機能はtaiymeで独自実装したものです。"
+  _features:
     _tickerPosition:
       label: "ノートのサーバー情報の表示位置"
       default: "デフォルト"
@@ -2847,12 +2843,6 @@ _tms:
     _pullToRefreshAllReload:
       label: "「引っ張ってリロード」でページ全体を再読み込みする"
       caption: "構成しているページ全体を再読み込みする動作に置き換えます。"
-  _flags:
-    title: "taiyme実験的機能"
-    description: "これらの機能はtaiymeで独自実装したものです。"
-    warning: "これらの設定を有効にすると、ページの表示や挙動に深刻な影響を及ぼし、{name}が正常に利用できなくなる可能性があります。"
-    forceFetchX: "{x}を強制取得"
-    openX: "{x}を開く"
     _preventLongPressContextMenu:
       label: "長押しによるコンテキストメニューイベントの発行を防ぐ"
       caption: "長押しを含む操作が中断される問題を解消します。"
diff --git a/packages/frontend/src/components/TmsSoftwareDonation.vue b/packages/frontend/src/components/TmsSoftwareDonation.vue
index 25eaf2b8defe..9b27c11426dd 100644
--- a/packages/frontend/src/components/TmsSoftwareDonation.vue
+++ b/packages/frontend/src/components/TmsSoftwareDonation.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <FormLink to="https://u.taiy.me/donate" external>
 	<template #icon><i class="ti ti-pig-money"></i></template>
-	<template #default>{{ i18n.tsx._tms.supportX({ name: i18n.ts._tms.taiy }) }}</template>
+	<template #default>{{ i18n.ts._tms.supportTaiy }}</template>
 	<template #suffix>Donation</template>
 </FormLink>
 </template>
diff --git a/packages/frontend/src/pages/tms/about.vue b/packages/frontend/src/pages/tms/about.vue
index bd6f3f809cf9..500342699fa2 100644
--- a/packages/frontend/src/pages/tms/about.vue
+++ b/packages/frontend/src/pages/tms/about.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkSpacer :contentMax="600" :marginMin="20">
 			<div class="_gaps_m">
 				<TmsNoCache><TmsSoftwareBanner/></TmsNoCache>
-				<div style="text-align: center;">{{ i18n.ts._tms._about.description }}</div>
+				<div style="text-align: center;">{{ i18n.ts._tms._about.taiymeIsOSS }}</div>
 				<FormSection>
 					<div class="_gaps_s">
 						<TmsSoftwareRepository/>
@@ -61,7 +61,7 @@ import TmsSoftwareDonation from '@/components/TmsSoftwareDonation.vue';
 import TmsSoftwareRepository from '@/components/TmsSoftwareRepository.vue';
 
 definePageMetadata(() => ({
-	title: i18n.ts._tms._about.title,
+	title: i18n.ts._tms.aboutTaiyme,
 	icon: 'ti ti-info-circle',
 }));
 </script>
diff --git a/packages/frontend/src/pages/tms/features.form.vue b/packages/frontend/src/pages/tms/features.form.vue
new file mode 100644
index 000000000000..17bcb4933f36
--- /dev/null
+++ b/packages/frontend/src/pages/tms/features.form.vue
@@ -0,0 +1,106 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div class="_gaps_m">
+	<div class="_gaps_s">
+		<MkInfo>{{ i18n.ts._tms.taiymeFeaturesDescription }} <MkA to="/tms/about" class="_link">{{ i18n.ts.learnMore }}</MkA></MkInfo>
+	</div>
+	<MkFolder defaultOpen>
+		<template #icon><i class="ti ti-palette"></i></template>
+		<template #label>{{ i18n.ts.appearance }}</template>
+		<template v-if="appearancesForm.modified.value" #footer>
+			<MkFormFooter :form="appearancesForm"/>
+		</template>
+		<div class="_gaps">
+			<MkSelect v-model="appearancesForm.state.tickerPosition">
+				<template #label>
+					<span>{{ i18n.ts._tms._features._tickerPosition.label }}</span>
+					<span v-if="appearancesForm.modifiedStates.tickerPosition" class="_modified">{{ i18n.ts.modified }}</span>
+				</template>
+				<option value="default">{{ i18n.ts._tms._features._tickerPosition.default }}</option>
+				<option value="leftVerticalBar">{{ i18n.ts._tms._features._tickerPosition.leftVerticalBar }}</option>
+				<option value="rightVerticalBar">{{ i18n.ts._tms._features._tickerPosition.rightVerticalBar }}</option>
+				<option value="leftWatermark">{{ i18n.ts._tms._features._tickerPosition.leftWatermark }}</option>
+				<option value="rightWatermark">{{ i18n.ts._tms._features._tickerPosition.rightWatermark }}</option>
+			</MkSelect>
+			<MkSelect v-model="appearancesForm.state.superMenuDisplayMode">
+				<template #label>
+					<span>{{ i18n.ts._tms._features._superMenuDisplayMode.label }}</span>
+					<span v-if="appearancesForm.modifiedStates.superMenuDisplayMode" class="_modified">{{ i18n.ts.modified }}</span>
+				</template>
+				<template #caption>{{ i18n.ts._tms._features._superMenuDisplayMode.caption }}</template>
+				<option value="default">{{ i18n.ts._tms._features._superMenuDisplayMode.default }}</option>
+				<option value="classic">{{ i18n.ts._tms._features._superMenuDisplayMode.classic }}</option>
+				<option value="forceList">{{ i18n.ts._tms._features._superMenuDisplayMode.forceList }}</option>
+			</MkSelect>
+		</div>
+	</MkFolder>
+	<MkFolder defaultOpen>
+		<template #icon><i class="ti ti-hand-click"></i></template>
+		<template #label>{{ i18n.ts.operations }}</template>
+		<template v-if="operationsForm.modified.value" #footer>
+			<MkFormFooter :form="operationsForm"/>
+		</template>
+		<div class="_gaps">
+			<MkSelect v-model="operationsForm.state.pullToRefreshSensitivity">
+				<template #label>
+					<span>{{ i18n.ts._tms._features._pullToRefreshSensitivity.label }}</span>
+					<span v-if="operationsForm.modifiedStates.pullToRefreshSensitivity" class="_modified">{{ i18n.ts.modified }}</span>
+				</template>
+				<template #caption>{{ i18n.ts._tms._features._pullToRefreshSensitivity.caption }}</template>
+				<option value="low">{{ i18n.ts._tms._features._pullToRefreshSensitivity.low }}</option>
+				<option value="middle">{{ i18n.ts._tms._features._pullToRefreshSensitivity.middle }}</option>
+				<option value="high">{{ i18n.ts._tms._features._pullToRefreshSensitivity.high }}</option>
+			</MkSelect>
+			<MkSwitch v-model="operationsForm.state.pullToRefreshAllReload">
+				<template #label>
+					<span>{{ i18n.ts._tms._features._pullToRefreshAllReload.label }}</span>
+					<span v-if="operationsForm.modifiedStates.pullToRefreshAllReload" class="_modified">{{ i18n.ts.modified }}</span>
+				</template>
+				<template #caption>{{ i18n.ts._tms._features._pullToRefreshAllReload.caption }}</template>
+			</MkSwitch>
+			<MkSwitch v-model="operationsForm.state.preventLongPressContextMenu">
+				<template #label>
+					<span>{{ i18n.ts._tms._features._preventLongPressContextMenu.label }}</span>
+					<span class="_beta">{{ i18n.ts.experimentalFeatures }}</span>
+					<span v-if="operationsForm.modifiedStates.preventLongPressContextMenu" class="_modified">{{ i18n.ts.modified }}</span>
+				</template>
+				<template #caption>{{ i18n.ts._tms._features._preventLongPressContextMenu.caption }}</template>
+			</MkSwitch>
+		</div>
+	</MkFolder>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { i18n } from '@/i18n.js';
+import { useForm } from '@/scripts/use-form.js';
+import { tmsFlaskStore } from '@/tms/flask-store.js';
+import { tmsStore } from '@/tms/store.js';
+import MkFolder from '@/components/MkFolder.vue';
+import MkFormFooter from '@/components/MkFormFooter.vue';
+import MkInfo from '@/components/MkInfo.vue';
+import MkSelect from '@/components/MkSelect.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
+
+const appearancesForm = useForm({
+	tickerPosition: tmsStore.state.tickerPosition,
+	superMenuDisplayMode: tmsStore.state.superMenuDisplayMode,
+}, async (state) => {
+	tmsStore.set('tickerPosition', state.tickerPosition);
+	tmsStore.set('superMenuDisplayMode', state.superMenuDisplayMode);
+});
+
+const operationsForm = useForm({
+	pullToRefreshSensitivity: tmsStore.state.pullToRefreshSensitivity,
+	pullToRefreshAllReload: tmsStore.state.pullToRefreshAllReload,
+	preventLongPressContextMenu: tmsFlaskStore.state.preventLongPressContextMenu,
+}, async (state) => {
+	tmsStore.set('pullToRefreshSensitivity', state.pullToRefreshSensitivity);
+	tmsStore.set('pullToRefreshAllReload', state.pullToRefreshAllReload);
+	tmsFlaskStore.set('preventLongPressContextMenu', state.preventLongPressContextMenu);
+});
+</script>
diff --git a/packages/frontend/src/pages/tms/features.vue b/packages/frontend/src/pages/tms/features.vue
new file mode 100644
index 000000000000..4d7e7d7550bc
--- /dev/null
+++ b/packages/frontend/src/pages/tms/features.vue
@@ -0,0 +1,38 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<MkStickyContainer>
+	<template #header><MkPageHeader/></template>
+	<template #default>
+		<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
+			<FormSuspense :p="ready">
+				<XFeaturesForm/>
+			</FormSuspense>
+		</MkSpacer>
+	</template>
+</MkStickyContainer>
+</template>
+
+<script lang="ts" setup>
+import { defineAsyncComponent } from 'vue';
+import { i18n } from '@/i18n.js';
+import { definePageMetadata } from '@/scripts/page-metadata.js';
+import { tmsFlaskStore } from '@/tms/flask-store.js';
+import { tmsStore } from '@/tms/store.js';
+import FormSuspense from '@/components/form/suspense.vue';
+
+const ready = async () => {
+	await tmsStore.loaded;
+	await tmsFlaskStore.loaded;
+};
+
+const XFeaturesForm = defineAsyncComponent(() => import('@/pages/tms/features.form.vue'));
+
+definePageMetadata(() => ({
+	title: i18n.ts._tms.taiymeFeatures,
+	icon: 'ti ti-settings',
+}));
+</script>
diff --git a/packages/frontend/src/pages/tms/flags/index.main.vue b/packages/frontend/src/pages/tms/flags/index.main.vue
deleted file mode 100644
index a0778252c5b2..000000000000
--- a/packages/frontend/src/pages/tms/flags/index.main.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div class="_gaps_m">
-	<FormSection>
-		<div class="_gaps">
-			<MkSwitch v-model="preventLongPressContextMenu">
-				<template #label>{{ i18n.ts._tms._flags._preventLongPressContextMenu.label }}</template>
-				<template #caption>{{ i18n.ts._tms._flags._preventLongPressContextMenu.caption }}</template>
-			</MkSwitch>
-		</div>
-	</FormSection>
-	<FormSection>
-		<template #label>For developer</template>
-		<div class="_gaps_s">
-			<MkFolder defaultOpen>
-				<template #label>ForceFetchX</template>
-				<div class="_buttons">
-					<MkButton @click="forceFetchLocale">{{ i18n.tsx._tms._flags.forceFetchX({ x: `${lang}.${version}.json` }) }}</MkButton>
-				</div>
-			</MkFolder>
-			<MkFolder defaultOpen>
-				<template #label>OpenX</template>
-				<div class="_buttons">
-					<MkButton @click="openMkUpdated">{{ i18n.tsx._tms._flags.openX({ x: 'MkUpdated' }) }}</MkButton>
-					<MkButton @click="openMkDonation">{{ i18n.tsx._tms._flags.openX({ x: 'MkDonation' }) }}</MkButton>
-				</div>
-			</MkFolder>
-		</div>
-	</FormSection>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { computed, defineAsyncComponent, readonly, ref, watch } from 'vue';
-import { commitHash, lang, version } from '@@/js/config.js';
-import { i18n } from '@/i18n.js';
-import { miLocalStorage } from '@/local-storage.js';
-import { confirm, popup, waiting } from '@/os.js';
-import { tmsFlaskStore } from '@/tms/flask-store.js';
-import FormSection from '@/components/form/section.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkFolder from '@/components/MkFolder.vue';
-import MkSwitch from '@/components/MkSwitch.vue';
-
-//#region 即時変更
-const preventLongPressContextMenu = computed(tmsFlaskStore.makeGetterSetter('preventLongPressContextMenu'));
-//#endregion
-
-const confirmDialog = async (): Promise<boolean> => {
-	const { canceled } = await confirm({
-		type: 'info',
-		text: 'Execute?',
-		okText: 'Yes',
-		cancelText: 'No',
-	});
-	return !canceled;
-};
-
-const forceFetchLocale = async (): Promise<void> => {
-	if (!(await confirmDialog())) return;
-	waiting();
-	const revision = commitHash ?? 'unknown';
-	const newLocaleVersion = `${version}+REV:${revision}`;
-	const res = await window.fetch(`/assets/locales/${lang}.${version}.json?date=${Date.now().toString()}`);
-	if (res.status === 200) {
-		const newLocale = await res.text();
-		miLocalStorage.setItem('locale', newLocale);
-		miLocalStorage.setItem('localeVersion', newLocaleVersion);
-	}
-	location.reload();
-};
-
-const openMkUpdated = async (): Promise<void> => {
-	if (!(await confirmDialog())) return;
-	const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {
-		closed: () => dispose(),
-	});
-};
-
-const openMkDonation = async (): Promise<void> => {
-	if (!(await confirmDialog())) return;
-	const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkDonation.vue')), {}, {
-		closed: () => dispose(),
-	});
-};
-
-const edited = ref(false);
-const changed = ref(false);
-
-watch([
-], () => {
-	edited.value = true;
-	changed.value = true;
-}, { deep: true });
-
-const save = (): void => {
-	if (!changed.value) return;
-	changed.value = false;
-};
-
-defineExpose({
-	save,
-	edited: readonly(edited),
-	changed: readonly(changed),
-});
-</script>
diff --git a/packages/frontend/src/pages/tms/flags/index.vue b/packages/frontend/src/pages/tms/flags/index.vue
deleted file mode 100644
index a6dc29977647..000000000000
--- a/packages/frontend/src/pages/tms/flags/index.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<MkStickyContainer>
-	<template #header><MkPageHeader/></template>
-	<template #default>
-		<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
-			<div class="_gaps_m">
-				<TmsSoftwareVersions/>
-				<div class="_gaps_s">
-					<MkInfo>{{ i18n.ts._tms._flags.description }}</MkInfo>
-					<MkInfo warn>{{ i18n.tsx._tms._flags.warning({ name: instance.name ?? host }) }}</MkInfo>
-					<MkInfo>{{ i18n.ts._tms.reportIssuesToGithub }} <a href="https://github.com/taiyme/misskey/issues" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a></MkInfo>
-				</div>
-				<FormSuspense :p="ready">
-					<XMain ref="xMain"/>
-				</FormSuspense>
-				<div class="_buttonsCenter"><MkButton rounded small link to="/tms/settings"><i class="ti ti-settings"></i> {{ i18n.ts._tms.taiymeSettings }}</MkButton></div>
-			</div>
-		</MkSpacer>
-	</template>
-	<template v-if="xMain" #footer>
-		<div v-show="xMain.edited" :class="$style.footer">
-			<MkSpacer :contentMax="700" :marginMin="16" :marginMax="16">
-				<MkButton primary rounded :disabled="!xMain.changed" @click="xMain.save()"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
-			</MkSpacer>
-		</div>
-	</template>
-</MkStickyContainer>
-</template>
-
-<script lang="ts" setup>
-import { defineAsyncComponent, shallowRef } from 'vue';
-import { host } from '@@/js/config.js';
-import { i18n } from '@/i18n.js';
-import { instance } from '@/instance.js';
-import { definePageMetadata } from '@/scripts/page-metadata.js';
-import { tmsFlaskStore } from '@/tms/flask-store.js';
-import { tmsStore } from '@/tms/store.js';
-import FormSuspense from '@/components/form/suspense.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInfo from '@/components/MkInfo.vue';
-import TmsSoftwareVersions from '@/components/TmsSoftwareVersions.vue';
-
-const ready = async (): Promise<void> => {
-	await tmsStore.loaded;
-	await tmsFlaskStore.loaded;
-};
-
-const XMain = defineAsyncComponent(() => import('@/pages/tms/flags/index.main.vue'));
-const xMain = shallowRef<InstanceType<typeof XMain> | null>(null);
-
-definePageMetadata(() => ({
-	title: i18n.ts._tms._flags.title,
-	icon: 'ti ti-flask',
-}));
-</script>
-
-<style lang="scss" module>
-.footer {
-	-webkit-backdrop-filter: var(--MI-blur, blur(15px));
-	backdrop-filter: var(--MI-blur, blur(15px));
-}
-</style>
diff --git a/packages/frontend/src/pages/tms/settings/index.main.vue b/packages/frontend/src/pages/tms/settings/index.main.vue
deleted file mode 100644
index 4dd0b2d70537..000000000000
--- a/packages/frontend/src/pages/tms/settings/index.main.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<div class="_gaps_m">
-	<FormSection>
-		<template #label>{{ i18n.ts.appearance }}</template>
-		<div class="_gaps">
-			<MkSelect v-model="tickerPosition">
-				<template #label>{{ i18n.ts._tms._settings._tickerPosition.label }}</template>
-				<option value="default">{{ i18n.ts._tms._settings._tickerPosition.default }}</option>
-				<option value="leftVerticalBar">{{ i18n.ts._tms._settings._tickerPosition.leftVerticalBar }}</option>
-				<option value="rightVerticalBar">{{ i18n.ts._tms._settings._tickerPosition.rightVerticalBar }}</option>
-				<option value="leftWatermark">{{ i18n.ts._tms._settings._tickerPosition.leftWatermark }}</option>
-				<option value="rightWatermark">{{ i18n.ts._tms._settings._tickerPosition.rightWatermark }}</option>
-			</MkSelect>
-			<MkSelect v-model="superMenuDisplayMode">
-				<template #label>{{ i18n.ts._tms._settings._superMenuDisplayMode.label }}</template>
-				<template #caption>{{ i18n.ts._tms._settings._superMenuDisplayMode.caption }}</template>
-				<option value="default">{{ i18n.ts._tms._settings._superMenuDisplayMode.default }}</option>
-				<option value="classic">{{ i18n.ts._tms._settings._superMenuDisplayMode.classic }}</option>
-				<option value="forceList">{{ i18n.ts._tms._settings._superMenuDisplayMode.forceList }}</option>
-			</MkSelect>
-		</div>
-	</FormSection>
-	<FormSection>
-		<template #label>{{ i18n.ts.operations }}</template>
-		<div class="_gaps">
-			<MkSelect v-model="pullToRefreshSensitivity">
-				<template #label>{{ i18n.ts._tms._settings._pullToRefreshSensitivity.label }}</template>
-				<template #caption>{{ i18n.ts._tms._settings._pullToRefreshSensitivity.caption }}</template>
-				<option value="low">{{ i18n.ts._tms._settings._pullToRefreshSensitivity.low }}</option>
-				<option value="middle">{{ i18n.ts._tms._settings._pullToRefreshSensitivity.middle }}</option>
-				<option value="high">{{ i18n.ts._tms._settings._pullToRefreshSensitivity.high }}</option>
-			</MkSelect>
-			<MkSwitch v-model="pullToRefreshAllReload">
-				<template #label>{{ i18n.ts._tms._settings._pullToRefreshAllReload.label }}</template>
-				<template #caption>{{ i18n.ts._tms._settings._pullToRefreshAllReload.caption }}</template>
-			</MkSwitch>
-		</div>
-	</FormSection>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { computed, readonly, ref, watch } from 'vue';
-import { i18n } from '@/i18n.js';
-import { confirm } from '@/os.js';
-import { unisonReload } from '@/scripts/unison-reload.js';
-import { tmsStore } from '@/tms/store.js';
-import FormSection from '@/components/form/section.vue';
-import MkSelect from '@/components/MkSelect.vue';
-import MkSwitch from '@/components/MkSwitch.vue';
-
-//#region 即時変更
-const superMenuDisplayMode = computed(tmsStore.makeGetterSetter('superMenuDisplayMode'));
-const pullToRefreshAllReload = computed(tmsStore.makeGetterSetter('pullToRefreshAllReload'));
-//#endregion
-
-//#region 即時変更 (ダイアログ付き)
-const tickerPosition = computed({
-	get: () => tmsStore.reactiveState.tickerPosition.value,
-	set: (newValue) => {
-		tmsStore.set('tickerPosition', newValue);
-		reloadAsk();
-	},
-});
-const pullToRefreshSensitivity = computed({
-	get: () => tmsStore.reactiveState.pullToRefreshSensitivity.value,
-	set: (newValue) => {
-		tmsStore.set('pullToRefreshSensitivity', newValue);
-		reloadAsk();
-	},
-});
-//#endregion
-
-const reloadAsk = async (): Promise<void> => {
-	const { canceled } = await confirm({
-		type: 'info',
-		text: i18n.ts.reloadToApplySetting,
-	});
-	if (canceled) return;
-
-	unisonReload();
-};
-
-const edited = ref(false);
-const changed = ref(false);
-
-watch([
-], () => {
-	edited.value = true;
-	changed.value = true;
-}, { deep: true });
-
-const save = (): void => {
-	if (!changed.value) return;
-	changed.value = false;
-};
-
-defineExpose({
-	save,
-	edited: readonly(edited),
-	changed: readonly(changed),
-});
-</script>
diff --git a/packages/frontend/src/pages/tms/settings/index.vue b/packages/frontend/src/pages/tms/settings/index.vue
deleted file mode 100644
index 079d77050d23..000000000000
--- a/packages/frontend/src/pages/tms/settings/index.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<MkStickyContainer>
-	<template #header><MkPageHeader/></template>
-	<template #default>
-		<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
-			<div class="_gaps_m">
-				<div class="_gaps_s">
-					<MkInfo>{{ i18n.ts._tms._settings.description }}</MkInfo>
-					<MkInfo>{{ i18n.ts._tms.reportIssuesToGithub }} <a href="https://github.com/taiyme/misskey/issues" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a></MkInfo>
-				</div>
-				<FormSuspense :p="ready">
-					<XMain ref="xMain"/>
-				</FormSuspense>
-				<div class="_buttonsCenter"><MkButton rounded small link to="/tms/flags"><i class="ti ti-flask"></i> {{ i18n.ts._tms.taiymeFlags }}</MkButton></div>
-			</div>
-		</MkSpacer>
-	</template>
-	<template v-if="xMain" #footer>
-		<div v-show="xMain.edited" :class="$style.footer">
-			<MkSpacer :contentMax="700" :marginMin="16" :marginMax="16">
-				<MkButton primary rounded :disabled="!xMain.changed" @click="xMain.save()"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
-			</MkSpacer>
-		</div>
-	</template>
-</MkStickyContainer>
-</template>
-
-<script lang="ts" setup>
-import { defineAsyncComponent, shallowRef } from 'vue';
-import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/scripts/page-metadata.js';
-import { tmsFlaskStore } from '@/tms/flask-store.js';
-import { tmsStore } from '@/tms/store.js';
-import FormSuspense from '@/components/form/suspense.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkInfo from '@/components/MkInfo.vue';
-
-const ready = async (): Promise<void> => {
-	await tmsStore.loaded;
-	await tmsFlaskStore.loaded;
-};
-
-const XMain = defineAsyncComponent(() => import('@/pages/tms/settings/index.main.vue'));
-const xMain = shallowRef<InstanceType<typeof XMain> | null>(null);
-
-definePageMetadata(() => ({
-	title: i18n.ts._tms._settings.title,
-	icon: 'ti ti-settings',
-}));
-</script>
-
-<style lang="scss" module>
-.footer {
-	-webkit-backdrop-filter: var(--MI-blur, blur(15px));
-	backdrop-filter: var(--MI-blur, blur(15px));
-}
-</style>
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 31e9c6491910..002b2871cc15 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -579,17 +579,21 @@ const routes: RouteDef[] = [{
 }, {
 	path: '/tms/about',
 	component: page(() => import('@/pages/tms/about.vue')),
+}, {
+	path: '/tms/features',
+	component: page(() => import('@/pages/tms/features.vue')),
+	loginRequired: true,
 }, {
 	path: '/tms/settings',
-	component: page(() => import('@/pages/tms/settings/index.vue')),
+	redirect: '/tms/features',
 	loginRequired: true,
 }, {
 	path: '/tms/flags',
-	component: page(() => import('@/pages/tms/flags/index.vue')),
+	redirect: '/tms/features',
 	loginRequired: true,
 }, {
 	path: '/settings/taiyme-services',
-	redirect: '/tms/settings',
+	redirect: '/tms/features',
 	loginRequired: true,
 }, {
 	name: 'index',
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index bf42969ad258..eece78a6cb48 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -383,6 +383,8 @@ rt {
 	border: solid 1px var(--MI_THEME-accent);
 	border-radius: 4px;
 	vertical-align: top;
+	display: inline-block;
+	line-height: 1;
 }
 
 ._modified {
@@ -393,6 +395,8 @@ rt {
 	border: solid 1px var(--MI_THEME-warn);
 	border-radius: 4px;
 	vertical-align: top;
+	display: inline-block;
+	line-height: 1;
 }
 
 ._table {
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index 1b71027bf1cd..f589fcd6f914 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -157,9 +157,9 @@ export function openInstanceMenu(ev: MouseEvent) {
 		to: '/tms/about',
 	}, {
 		type: 'link',
-		text: i18n.ts._tms.taiymeSettings,
+		text: i18n.ts._tms.taiymeFeatures,
 		icon: 'ti ti-settings',
-		to: '/tms/settings',
+		to: '/tms/features',
 	});
 
 	os.popupMenu(menuItems, ev.currentTarget ?? ev.target, {