From 6fc8415b00308b1605cc7339bbc67591c775bf4b Mon Sep 17 00:00:00 2001
From: Aylam <aaronloit@disroot.org>
Date: Sat, 26 Aug 2023 10:01:04 +0300
Subject: [PATCH] Unify useBlurEffect and useBlurEffectForModal

---
 packages/client/src/init.ts                     | 17 ++++++-----------
 packages/client/src/pages/settings/general.vue  |  6 ------
 .../src/pages/settings/preferences-backups.vue  |  1 -
 packages/client/src/store.ts                    |  4 ----
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index deb8d9679..5bcab9e07 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -363,17 +363,6 @@ function checkForSplash() {
 		}
 	});
 
-	watch(
-		defaultStore.reactiveState.useBlurEffectForModal,
-		(v) => {
-			document.documentElement.style.setProperty(
-				"--modalBgFilter",
-				v ? "blur(4px)" : "none",
-			);
-		},
-		{ immediate: true },
-	);
-
 	watch(
 		defaultStore.reactiveState.useBlurEffect,
 		(v) => {
@@ -382,6 +371,12 @@ function checkForSplash() {
 			} else {
 				document.documentElement.style.setProperty("--blur", "none");
 			}
+
+			document.documentElement.style.setProperty(
+				"--modalBgFilter",
+				v ? "blur(4px)" : "none",
+			);
+
 			const theme = defaultStore.state.darkMode ? ColdDeviceStorage.get("darkTheme") : ColdDeviceStorage.get("lightTheme");
 			applyTheme(theme);
 		},
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 406e82c7d..4b9a2fa78 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -159,9 +159,6 @@
 			<FormSwitch v-model="useBlurEffect" class="_formBlock">{{
 				i18n.ts.useBlurEffect
 			}}</FormSwitch>
-			<FormSwitch v-model="useBlurEffectForModal" class="_formBlock">{{
-				i18n.ts.useBlurEffectForModal
-			}}</FormSwitch>
 			<FormSwitch
 				v-model="showGapBetweenNotesInTimeline"
 				class="_formBlock"
@@ -303,9 +300,6 @@ const reduceAnimation = computed(
 		(v) => !v,
 	),
 );
-const useBlurEffectForModal = computed(
-	defaultStore.makeGetterSetter("useBlurEffectForModal"),
-);
 const useBlurEffect = computed(defaultStore.makeGetterSetter("useBlurEffect"));
 const showGapBetweenNotesInTimeline = computed(
 	defaultStore.makeGetterSetter("showGapBetweenNotesInTimeline"),
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 8dd2b05bf..f79538821 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -92,7 +92,6 @@ const defaultStoreSaveKeys: (keyof (typeof defaultStore)["state"])[] = [
 	"enterSendsMessage",
 	"useOsNativeEmojis",
 	"disableDrawer",
-	"useBlurEffectForModal",
 	"useBlurEffect",
 	"showFixedPostForm",
 	"enableInfiniteScroll",
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index dd1e25365..217b702f5 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -202,10 +202,6 @@ export const defaultStore = markRaw(
 			where: "device",
 			default: false,
 		},
-		useBlurEffectForModal: {
-			where: "device",
-			default: true,
-		},
 		useBlurEffect: {
 			where: "device",
 			default: true,