Merge pull request #643 from qtchaos/proxy-syncing

Implement Worker URLs syncing with backend

src/backend/accounts/settings.ts

@@ -7,12 +7,14 @@ export interface SettingsInput {
   applicationLanguage?: string;
   applicationTheme?: string | null;
   defaultSubtitleLanguage?: string;
+  proxyUrls?: string[] | null;
 }
 
 export interface SettingsResponse {
   applicationTheme?: string | null;
   applicationLanguage?: string | null;
   defaultSubtitleLanguage?: string | null;
+  proxyUrls?: string[] | null;
 }
 
 export function updateSettings(

src/hooks/auth/useAuthData.ts

@@ -20,6 +20,7 @@ export function useAuthData() {
   const loggedIn = !!useAuthStore((s) => s.account);
   const setAccount = useAuthStore((s) => s.setAccount);
   const removeAccount = useAuthStore((s) => s.removeAccount);
+  const setProxySet = useAuthStore((s) => s.setProxySet);
   const clearBookmarks = useBookmarkStore((s) => s.clear);
   const clearProgress = useProgressStore((s) => s.clear);
   const setTheme = useThemeStore((s) => s.setTheme);
@@ -80,6 +81,10 @@ export function useAuthData() {
       if (settings.applicationTheme) {
         setTheme(settings.applicationTheme);
       }
+
+      if (settings.proxyUrls) {
+        setProxySet(settings.proxyUrls);
+      }
     },
     [
       replaceBookmarks,
@@ -87,6 +92,7 @@ export function useAuthData() {
       setAppLanguage,
       importSubtitleLanguage,
       setTheme,
+      setProxySet,
     ],
   );
 

src/pages/Settings.tsx

@@ -140,10 +140,15 @@ export function SettingsPage() {
 
   const saveChanges = useCallback(async () => {
     if (account) {
-      if (state.appLanguage.changed || state.theme.changed) {
+      if (
+        state.appLanguage.changed ||
+        state.theme.changed ||
+        state.proxyUrls.changed
+      ) {
         await updateSettings(backendUrl, account, {
           applicationLanguage: state.appLanguage.state,
           applicationTheme: state.theme.state,
+          proxyUrls: state.proxyUrls.state?.filter((v) => v !== "") ?? null,
         });
       }
       if (state.deviceName.changed) {
@@ -166,7 +171,7 @@ export function SettingsPage() {
     setAppLanguage(state.appLanguage.state);
     setTheme(state.theme.state);
     setSubStyling(state.subtitleStyling.state);
-    setProxySet(state.proxyUrls.state);
+    setProxySet(state.proxyUrls.state?.filter((v) => v !== "") ?? null);
 
     if (state.profile.state) {
       updateProfile(state.profile.state);

src/pages/parts/auth/VerifyPassphrasePart.tsx

@@ -74,6 +74,7 @@ export function VerifyPassphrase(props: VerifyPassphraseProps) {
         applicationLanguage,
         defaultSubtitleLanguage: defaultSubtitleLanguage ?? undefined,
         applicationTheme: applicationTheme ?? undefined,
+        proxyUrls: undefined,
       });
 
       await restore(account);