xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-11-15 21:43:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 优化云同步功能，使access配置按更新时间合并，解决自定义模型配置在同步后丢失的问题

Browse Source
This commit is contained in:
织梦人
2024-09-05 21:52:25 +08:00
parent ccacfec918
commit 6dc868154d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/utils/sync.ts
View File

@@ -128,7 +128,13 @@ const MergeStates: StateMerger = {
});
const remoteDeletedSessionIds = remoteState.deletedSessionIds || {};
const finalIds: Record<string, any> = {};
localState.sessions = localState.sessions.filter((localSession) => {
if (finalIds[localSession.id]) {
return false;
}
finalIds[localSession.id] = true;
return (
(remoteDeletedSessionIds[localSession.id] || -1) <=
localSession.lastUpdate
@@ -209,9 +215,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 {