From c14c6b3786ca06e86d0750f9a98c41ed356bc3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=87?= <me@src.moe>
Date: Wed, 7 Jun 2023 00:38:50 +0800
Subject: [PATCH] fix: user default 'Basic Setting' should follow server's
 setting (#1795)

fix: user default 'Basic Setting' should follow system setting
---
 web/src/store/module/user.ts       | 7 +++++++
 web/src/types/modules/setting.d.ts | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/web/src/store/module/user.ts b/web/src/store/module/user.ts
index 29e39282..0e514add 100644
--- a/web/src/store/module/user.ts
+++ b/web/src/store/module/user.ts
@@ -21,8 +21,15 @@ const defaultLocalSetting: LocalSetting = {
 };
 
 export const convertResponseModelUser = (user: User): User => {
+  // user default 'Basic Setting' should follow server's setting
+  // 'Basic Setting' fields: locale, appearance
+  const { systemStatus } = store.getState().global;
+  const { locale, appearance } = systemStatus.customizedProfile;
+  const systemSetting = { locale, appearance };
+
   const setting: Setting = {
     ...defaultSetting,
+    ...systemSetting,
   };
   const { localSetting: storageLocalSetting } = storage.get(["localSetting"]);
   const localSetting: LocalSetting = {
diff --git a/web/src/types/modules/setting.d.ts b/web/src/types/modules/setting.d.ts
index 7a50662a..1c5edcca 100644
--- a/web/src/types/modules/setting.d.ts
+++ b/web/src/types/modules/setting.d.ts
@@ -1,5 +1,9 @@
 type Appearance = "system" | "light" | "dark";
 
+interface BasicSetting {
+  locale: Locale;
+  appearance: Appearance;
+}
 interface Setting {
   locale: Locale;
   appearance: Appearance;