Merge 357b74da59 into 673f907ea4

Update README.md
fix: Correct merge logic for state updates in sync utility
2025-10-09 11:36:38 +08:00 · 2025-06-27 09:32:44 +08:00 · 2025-06-19 20:18:28 +08:00 · 2025-02-21 14:09:57 +00:00
2 changed files with 4 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -22,12 +22,12 @@ English / [简体中文](./README_CN.md)
 [![MacOS][MacOS-image]][download-url]
 [![Linux][Linux-image]][download-url]
-[NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.dev) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition) 
+[NextChatAI](https://nextchat.club?utm_source=readme) / [iOS APP](https://apps.apple.com/us/app/nextchat-ai/id6743085599) / [Web App Demo](https://app.nextchat.club) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Enterprise Edition](#enterprise-edition) 
 [saas-url]: https://nextchat.club?utm_source=readme
 [saas-image]: https://img.shields.io/badge/NextChat-Saas-green?logo=microsoftedge
-[web-url]: https://app.nextchat.dev/
+[web-url]: https://app.nextchat.club/
 [download-url]: https://github.com/Yidadaa/ChatGPT-Next-Web/releases
 [Web-image]: https://img.shields.io/badge/Web-PWA-orange?logo=microsoftedge
 [Windows-image]: https://img.shields.io/badge/-Windows-blue?logo=windows
--- a/app/utils/sync.ts
+++ b/app/utils/sync.ts
@ -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 {
Author	SHA1	Message	Date
alex	2384457355	Merge `357b74da59` into `673f907ea4`	2025-06-27 09:32:44 +08:00
RiverRay	673f907ea4	Update README.md Some checks failed Run Tests / test (push) Has been cancelled Details	2025-06-19 20:18:28 +08:00
michaelia	357b74da59	fix: Correct merge logic for state updates in sync utility	2025-02-21 14:09:57 +00:00