xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-13 05:23:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 357b74da59 into 3809375694

Browse Source
This commit is contained in:
alex
2025-05-02 23:25:15 +08:00
committed by GitHub
parent 3809375694 357b74da59
commit 76018d4787
1 changed files with 2 additions and 2 deletions
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,
) {
const localUpdateTime = localState.lastUpdateTime ?? 0;
const remoteUpdateTime = localState.lastUpdateTime ?? 1;
const remoteUpdateTime = remoteState.lastUpdateTime ?? 1;
if (localUpdateTime < remoteUpdateTime) {
if (localUpdateTime > remoteUpdateTime) {
merge(remoteState, localState);
return { ...remoteState };
} else {