GithubProxy/ChatGPT-Next-Web
1
0
Fork 1
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-05-19 20:20:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correct merge logic for state updates in sync utility

Browse Source
This commit is contained in:
michaelia 2025-02-21 13:01:33 +00:00
parent f5f3ce94f6
commit 357b74da59
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/utils/sync.ts
View File

@ -153,9 +153,9 @@ export function mergeWithUpdate<T extends { lastUpdateTime?: number }>(
remoteState: T, remoteState: T,
) { ) {
const localUpdateTime = localState.lastUpdateTime ?? 0; const localUpdateTime = localState.lastUpdateTime ?? 0;
const remoteUpdateTime = localState.lastUpdateTime ?? 1; const remoteUpdateTime = remoteState.lastUpdateTime ?? 1;
if (localUpdateTime < remoteUpdateTime) { if (localUpdateTime > remoteUpdateTime) {
merge(remoteState, localState); merge(remoteState, localState);
return { ...remoteState }; return { ...remoteState };
} else { } else {