From bdbecce61a3ffe2fdb9775a1392b7536629b89ec Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 2 Oct 2023 00:21:30 +0900
Subject: [PATCH] chore: move showFeaturedNotesInTimeline setting to
 appropriate section

---
 .../client/src/pages/settings/general.vue     | 21 +++++++++++++++++
 packages/client/src/pages/settings/other.vue  | 23 -------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index a6ef6d45b..0ecb64960 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -80,6 +80,19 @@
 					{{ i18n.ts.reflectMayTakeTime }}</template
 				></FormSwitch
 			>
+			<FormSwitch
+				v-model="$i.injectFeaturedNote"
+				class="_formBlock"
+				@update:modelValue="onChangeInjectFeaturedNote"
+			>
+				{{ i18n.ts.showFeaturedNotesInTimeline }}
+			</FormSwitch>
+			<!-- <FormSwitch v-model="reportError" class="_formBlock"
+				>{{ i18n.ts.sendErrorReports
+				}}<template #caption>{{
+					i18n.ts.sendErrorReportsDescription
+				}}</template></FormSwitch
+			> -->
 			<FormSwitch v-model="detectPostLanguage" class="_formBlock">{{
 				i18n.ts.detectPostLanguage
 			}}</FormSwitch>
@@ -391,6 +404,14 @@ const openServerInfo = computed(
 	defaultStore.makeGetterSetter("openServerInfo"),
 );
 
+function onChangeInjectFeaturedNote(v) {
+	os.api("i/update", {
+		injectFeaturedNote: v,
+	}).then((i) => {
+		$i!.injectFeaturedNote = i.injectFeaturedNote;
+	});
+}
+
 watch(swipeOnDesktop, () => {
 	defaultStore.set("swipeOnMobile", true);
 });
diff --git a/packages/client/src/pages/settings/other.vue b/packages/client/src/pages/settings/other.vue
index 6b42cdce7..0fd44a08a 100644
--- a/packages/client/src/pages/settings/other.vue
+++ b/packages/client/src/pages/settings/other.vue
@@ -1,17 +1,5 @@
 <template>
 	<div class="_formRoot">
-		<FormSwitch
-			v-model="$i.injectFeaturedNote"
-			class="_formBlock"
-			@update:modelValue="onChangeInjectFeaturedNote"
-		>
-			{{ i18n.ts.showFeaturedNotesInTimeline }}
-		</FormSwitch>
-
-		<!--
-	<FormSwitch v-model="reportError" class="_formBlock">{{ i18n.ts.sendErrorReports }}<template #caption>{{ i18n.ts.sendErrorReportsDescription }}</template></FormSwitch>
-	-->
-
 		<FormLink to="/settings/account-info" class="_formBlock">{{
 			i18n.ts.accountInfo
 		}}</FormLink>
@@ -29,21 +17,10 @@
 </template>
 
 <script lang="ts" setup>
-import FormSwitch from "@/components/form/switch.vue";
 import FormLink from "@/components/form/link.vue";
-import * as os from "@/os";
-import { $i } from "@/account";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 
-function onChangeInjectFeaturedNote(v) {
-	os.api("i/update", {
-		injectFeaturedNote: v,
-	}).then((i) => {
-		$i!.injectFeaturedNote = i.injectFeaturedNote;
-	});
-}
-
 definePageMetadata({
 	title: i18n.ts.other,
 	icon: "ph-dots-three-outline ph-bold ph-lg",