mirror of
				https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
				synced 2025-11-04 08:13:43 +08:00 
			
		
		
		
	Merge pull request #4610 from rooben-me/fix-sync
Fix Sync Issue with Upstash
This commit is contained in:
		@@ -97,11 +97,18 @@ export const useSyncStore = createPersistStore(
 | 
			
		||||
      const client = this.getClient();
 | 
			
		||||
 | 
			
		||||
      try {
 | 
			
		||||
        const remoteState = JSON.parse(
 | 
			
		||||
          await client.get(config.username),
 | 
			
		||||
        ) as AppState;
 | 
			
		||||
        mergeAppState(localState, remoteState);
 | 
			
		||||
        setLocalAppState(localState);
 | 
			
		||||
        const remoteState = await client.get(config.username);
 | 
			
		||||
        if (!remoteState || remoteState === "") {
 | 
			
		||||
          await client.set(config.username, JSON.stringify(localState));
 | 
			
		||||
          console.log("[Sync] Remote state is empty, using local state instead.");
 | 
			
		||||
          return
 | 
			
		||||
        } else {
 | 
			
		||||
          const parsedRemoteState = JSON.parse(
 | 
			
		||||
            await client.get(config.username),
 | 
			
		||||
          ) as AppState;
 | 
			
		||||
          mergeAppState(localState, parsedRemoteState);
 | 
			
		||||
          setLocalAppState(localState);
 | 
			
		||||
       } 
 | 
			
		||||
      } catch (e) {
 | 
			
		||||
        console.log("[Sync] failed to get remote state", e);
 | 
			
		||||
        throw e;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user