Merge branch 'feat/fold' into 'develop'

make foldNotification default as it's no longer an experimental feature

Co-authored-by: Lhcfl <Lhcfl@outlook.com>

See merge request firefish/firefish!10774

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

@@ -131,6 +131,10 @@
 				i18n.ts.autocorrectNoteLanguage
 			}}</FormSwitch>
 
+			<FormSwitch v-model="foldNotification" class="_formBlock">{{
+				i18n.ts.foldNotification
+			}}</FormSwitch>
+
 			<FormSelect v-model="serverDisconnectedBehavior" class="_formBlock">
 				<template #label>{{ i18n.ts.whenServerDisconnected }}</template>
 				<option value="reload">
@@ -327,13 +331,6 @@
 			</FormSelect>
 		</FormSection>
 
-		<FormSection>
-			<template #label>{{ i18n.ts.experimentalFeatures }}</template>
-			<FormSwitch v-model="foldNotification" class="_formBlock">{{
-				i18n.ts.foldNotification
-			}}</FormSwitch>
-		</FormSection>
-
 		<FormSection>
 			<template #label>{{ i18n.ts.forMobile }}</template>
 			<FormSwitch

packages/client/src/store.ts

@@ -452,7 +452,7 @@ export const defaultStore = markRaw(
 		},
 		foldNotification: {
 			where: "deviceAccount",
-			default: false,
+			default: true,
 		},
 	}),
 );