Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web

Merge remote-tracking branch 'up/main'
# Conflicts: # app/store/chat.ts
2025-11-18 15:03:43 +08:00 · 2024-09-13 01:04:37 +00:00 · 2024-09-12 09:19:04 +08:00 · 2024-09-07 13:00:33 +08:00 · 2024-09-07 12:51:37 +08:00 · 2024-09-06 20:59:53 +08:00
12 changed files with 252 additions and 27 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -19,26 +19,26 @@ jobs:
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
-      
+
-      - 
+      -
        name: Extract metadata (tags, labels) for Docker
        id: meta
        uses: docker/metadata-action@v4
        with:
-          images: yidadaa/chatgpt-next-web
+          images: ${{ secrets.DOCKER_USERNAME }}/chatgpt-next-web
          tags: |
            type=raw,value=latest
            type=ref,event=tag
-      
+
-      - 
+      -
        name: Set up QEMU
        uses: docker/setup-qemu-action@v2
-      - 
+      -
        name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
-      
+
-      - 
+      -
        name: Build and push Docker image
        uses: docker/build-push-action@v4
        with:
@@ -49,4 +49,4 @@ jobs:
          labels: ${{ steps.meta.outputs.labels }}
          cache-from: type=gha
          cache-to: type=gha,mode=max
-            
+
--- a/app/command.ts
+++ b/app/command.ts
@@ -35,6 +35,7 @@ export function useCommand(commands: Commands = {}) {
 interface ChatCommands {
  new?: Command;
  newm?: Command;
  copy?: Command;
  next?: Command;
  prev?: Command;
  clear?: Command;
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -67,6 +67,7 @@ import {
  getMessageImages,
  isVisionModel,
  isDalle3,
  removeOutdatedEntries,
  showPlugins,
  safeLocalStorage,
 } from "../utils";
@@ -970,6 +971,7 @@ function _Chat() {
  const chatCommands = useChatCommand({
    new: () => chatStore.newSession(),
    newm: () => navigate(Path.NewChat),
    copy: () => chatStore.copySession(),
    prev: () => chatStore.nextSession(-1),
    next: () => chatStore.nextSession(1),
    clear: () =>
@@ -1100,10 +1102,20 @@ function _Chat() {
  };
  const deleteMessage = (msgId?: string) => {
-    chatStore.updateCurrentSession(
+    chatStore.updateCurrentSession((session) => {
-      (session) =>
+      session.deletedMessageIds &&
-        (session.messages = session.messages.filter((m) => m.id !== msgId)),
+        removeOutdatedEntries(session.deletedMessageIds);
-    );
+      session.messages = session.messages.filter((m) => {
        if (m.id !== msgId) {
          return true;
        }
        if (!session.deletedMessageIds) {
          session.deletedMessageIds = {} as Record<string, number>;
        }
        session.deletedMessageIds[m.id] = Date.now();
        return false;
      });
    });
  };
  const onDelete = (msgId: string) => {
--- a/app/components/settings.tsx
+++ b/app/components/settings.tsx
@@ -357,6 +357,21 @@ function SyncConfigModal(props: { onClose?: () => void }) {
            </select>
          </ListItem>
          <ListItem
            title={Locale.Settings.Sync.Config.EnableAutoSync.Title}
            subTitle={Locale.Settings.Sync.Config.EnableAutoSync.SubTitle}
          >
            <input
              type="checkbox"
              checked={syncStore.enableAutoSync}
              onChange={(e) => {
                syncStore.update(
                  (config) => (config.enableAutoSync = e.currentTarget.checked),
                );
              }}
            ></input>
          </ListItem>
          <ListItem
            title={Locale.Settings.Sync.Config.Proxy.Title}
            subTitle={Locale.Settings.Sync.Config.Proxy.SubTitle}
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -41,7 +41,11 @@ export default function RootLayout({
          name="viewport"
          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
        />
-        <link rel="manifest" href="/site.webmanifest" crossOrigin="use-credentials"></link>
+        <link
          rel="manifest"
          href="/site.webmanifest"
          crossOrigin="use-credentials"
        ></link>
        <script src="/serviceWorkerRegister.js" defer></script>
      </head>
      <body>
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@@ -48,6 +48,7 @@ const cn = {
    Commands: {
      new: "新建聊天",
      newm: "从面具新建聊天",
      copy: "复制当前聊天",
      next: "下一个聊天",
      prev: "上一个聊天",
      clear: "清除上下文",
@@ -215,6 +216,10 @@ const cn = {
          Title: "同步类型",
          SubTitle: "选择喜爱的同步服务器",
        },
        EnableAutoSync: {
          Title: "自动同步设置",
          SubTitle: "在回复完成或删除消息后自动同步数据",
        },
        Proxy: {
          Title: "启用代理",
          SubTitle: "在浏览器中同步时，必须启用代理以避免跨域限制",
--- a/app/locales/en.ts
+++ b/app/locales/en.ts
@@ -49,6 +49,7 @@ const en: LocaleType = {
    Commands: {
      new: "Start a new chat",
      newm: "Start a new chat with mask",
      copy: "Copy the current Chat",
      next: "Next Chat",
      prev: "Previous Chat",
      clear: "Clear Context",
@@ -217,6 +218,11 @@ const en: LocaleType = {
          Title: "Sync Type",
          SubTitle: "Choose your favorite sync service",
        },
        EnableAutoSync: {
          Title: "Auto Sync Settings",
          SubTitle:
            "Automatically synchronize data after replying or deleting messages",
        },
        Proxy: {
          Title: "Enable CORS Proxy",
          SubTitle: "Enable a proxy to avoid cross-origin restrictions",
--- a/app/store/access.ts
+++ b/app/store/access.ts
@@ -210,7 +210,7 @@ export const useAccessStore = createPersistStore(
        })
        .then((res: DangerConfig) => {
          console.log("[Config] got config from server", res);
-          set(() => ({ ...res }));
+          set(() => ({ lastUpdateTime: Date.now(), ...res }));
        })
        .catch(() => {
          console.error("[Config] failed to fetch config");
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -1,4 +1,8 @@
-import { trimTopic, getMessageTextContent } from "../utils";
+import {
  trimTopic,
  getMessageTextContent,
  removeOutdatedEntries,
 } from "../utils";
 import Locale, { getLang } from "../locales";
 import { showToast } from "../components/ui-lib";
@@ -27,6 +31,7 @@ import { createPersistStore } from "../utils/store";
 import { collectModelsWithDefaultModel } from "../utils/model";
 import { useAccessStore } from "./access";
 import { isDalle3, safeLocalStorage } from "../utils";
 import { useSyncStore } from "./sync";
 import { indexedDBStorage } from "@/app/utils/indexedDB-storage";
 const localStorage = safeLocalStorage();
@@ -78,6 +83,7 @@ export interface ChatSession {
  lastUpdate: number;
  lastSummarizeIndex: number;
  clearContextIndex?: number;
  deletedMessageIds?: Record<string, number>;
  mask: Mask;
 }
@@ -101,6 +107,7 @@ function createEmptySession(): ChatSession {
    },
    lastUpdate: Date.now(),
    lastSummarizeIndex: 0,
    deletedMessageIds: {},
    mask: createEmptyMask(),
  };
@@ -178,9 +185,19 @@ function fillTemplateWith(input: string, modelConfig: ModelConfig) {
  return output;
 }
 let cloudSyncTimer: any = null;
 function noticeCloudSync(): void {
  const syncStore = useSyncStore.getState();
  cloudSyncTimer && clearTimeout(cloudSyncTimer);
  cloudSyncTimer = setTimeout(() => {
    syncStore.autoSync();
  }, 500);
 }
 const DEFAULT_CHAT_STATE = {
  sessions: [createEmptySession()],
  currentSessionIndex: 0,
  deletedSessionIds: {} as Record<string, number>,
  lastInput: "",
 };
@@ -208,6 +225,28 @@ export const useChatStore = createPersistStore(
        });
      },
      copySession() {
        set((state) => {
          const { sessions, currentSessionIndex } = state;
          const emptySession = createEmptySession();
          // copy the session
          const curSession = JSON.parse(
            JSON.stringify(sessions[currentSessionIndex]),
          );
          curSession.id = emptySession.id;
          curSession.lastUpdate = emptySession.lastUpdate;
          const newSessions = [...sessions];
          newSessions.splice(0, 0, curSession);
          return {
            currentSessionIndex: 0,
            sessions: newSessions,
          };
        });
      },
      moveSession(from: number, to: number) {
        set((state) => {
          const { sessions, currentSessionIndex: oldIndex } = state;
@@ -270,7 +309,18 @@ export const useChatStore = createPersistStore(
        if (!deletedSession) return;
        const sessions = get().sessions.slice();
-        sessions.splice(index, 1);
+        const deletedSessionIds = { ...get().deletedSessionIds };
        removeOutdatedEntries(deletedSessionIds);
        const hasDelSessions = sessions.splice(index, 1);
        if (hasDelSessions?.length) {
          hasDelSessions.forEach((session) => {
            if (session.messages.length > 0) {
              deletedSessionIds[session.id] = Date.now();
            }
          });
        }
        const currentIndex = get().currentSessionIndex;
        let nextIndex = Math.min(
@@ -287,19 +337,24 @@ export const useChatStore = createPersistStore(
        const restoreState = {
          currentSessionIndex: get().currentSessionIndex,
          sessions: get().sessions.slice(),
          deletedSessionIds: get().deletedSessionIds,
        };
        set(() => ({
          currentSessionIndex: nextIndex,
          sessions,
          deletedSessionIds,
        }));
        noticeCloudSync();
        showToast(
          Locale.Home.DeleteToast,
          {
            text: Locale.Home.Revert,
            onClick() {
              set(() => restoreState);
              noticeCloudSync();
            },
          },
          5000,
@@ -320,6 +375,24 @@ export const useChatStore = createPersistStore(
        return session;
      },
      sortSessions() {
        const currentSession = get().currentSession();
        const sessions = get().sessions.slice();
        sessions.sort(
          (a, b) =>
            new Date(b.lastUpdate).getTime() - new Date(a.lastUpdate).getTime(),
        );
        const currentSessionIndex = sessions.findIndex((session) => {
          return session && currentSession && session.id === currentSession.id;
        });
        set((state) => ({
          currentSessionIndex,
          sessions,
        }));
      },
      onNewMessage(message: ChatMessage) {
        get().updateCurrentSession((session) => {
          session.messages = session.messages.concat();
@@ -327,6 +400,8 @@ export const useChatStore = createPersistStore(
        });
        get().updateStat(message);
        get().summarizeSession();
        get().sortSessions();
        noticeCloudSync();
      },
      async onUserInput(content: string, attachImages?: string[]) {
--- a/app/store/sync.ts
+++ b/app/store/sync.ts
@@ -26,6 +26,7 @@ export type SyncStore = GetStoreState<typeof useSyncStore>;
 const DEFAULT_SYNC_STATE = {
  provider: ProviderType.WebDAV,
  enableAutoSync: true,
  useProxy: true,
  proxyUrl: corsPath(ApiPath.Cors),
@@ -45,6 +46,8 @@ const DEFAULT_SYNC_STATE = {
  lastProvider: "",
 };
 let lastSyncTime = 0;
 export const useSyncStore = createPersistStore(
  DEFAULT_SYNC_STATE,
  (set, get) => ({
@@ -91,6 +94,16 @@ export const useSyncStore = createPersistStore(
    },
    async sync() {
      if (lastSyncTime && lastSyncTime >= Date.now() - 800) {
        return;
      }
      lastSyncTime = Date.now();
      const enableAutoSync = get().enableAutoSync;
      if (!enableAutoSync) {
        return;
      }
      const localState = getLocalAppState();
      const provider = get().provider;
      const config = get()[provider];
@@ -100,15 +113,15 @@ export const useSyncStore = createPersistStore(
        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.");
+          console.log(
-          return
+            "[Sync] Remote state is empty, using local state instead.",
          );
          return;
        } else {
-          const parsedRemoteState = JSON.parse(
+          const parsedRemoteState = JSON.parse(remoteState) as AppState;
            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;
@@ -123,6 +136,14 @@ export const useSyncStore = createPersistStore(
      const client = this.getClient();
      return await client.check();
    },
    async autoSync() {
      const { lastSyncTime, provider } = get();
      const syncStore = useSyncStore.getState();
      if (lastSyncTime && syncStore.cloudSync()) {
        syncStore.sync();
      }
    },
  }),
  {
    name: StoreKey.Sync,
--- a/app/utils.ts
+++ b/app/utils.ts
@@ -274,6 +274,19 @@ export function isDalle3(model: string) {
  return "dall-e-3" === model;
 }
 export function removeOutdatedEntries(
  timeMap: Record<string, number>,
 ): Record<string, number> {
  const oneMonthAgo = Date.now() - 30 * 24 * 60 * 60 * 1000;
  // Delete data from a month ago
  Object.keys(timeMap).forEach((id) => {
    if (timeMap[id] < oneMonthAgo) {
      delete timeMap[id];
    }
  });
  return timeMap;
 }
 export function showPlugins(provider: ServiceProvider, model: string) {
  if (
    provider == ServiceProvider.OpenAI ||
--- a/app/utils/sync.ts
+++ b/app/utils/sync.ts
@@ -8,6 +8,7 @@ import { useMaskStore } from "../store/mask";
 import { usePromptStore } from "../store/prompt";
 import { StoreKey } from "../constant";
 import { merge } from "./merge";
 import { removeOutdatedEntries } from "@/app/utils";
 type NonFunctionKeys<T> = {
  [K in keyof T]: T[K] extends (...args: any[]) => any ? never : K;
@@ -65,7 +66,10 @@ type StateMerger = {
 const MergeStates: StateMerger = {
  [StoreKey.Chat]: (localState, remoteState) => {
    // merge sessions
    const currentSession = useChatStore.getState().currentSession();
    const localSessions: Record<string, ChatSession> = {};
    const localDeletedSessionIds = localState.deletedSessionIds || {};
    localState.sessions.forEach((s) => (localSessions[s.id] = s));
    remoteState.sessions.forEach((remoteSession) => {
@@ -75,29 +79,98 @@ const MergeStates: StateMerger = {
      const localSession = localSessions[remoteSession.id];
      if (!localSession) {
        // if remote session is new, just merge it
-        localState.sessions.push(remoteSession);
+        if (
          (localDeletedSessionIds[remoteSession.id] || -1) <
          remoteSession.lastUpdate
        ) {
          localState.sessions.push(remoteSession);
        }
      } else {
        // if both have the same session id, merge the messages
        const localMessageIds = new Set(localSession.messages.map((v) => v.id));
        const localDeletedMessageIds = localSession.deletedMessageIds || {};
        remoteSession.messages.forEach((m) => {
          if (!localMessageIds.has(m.id)) {
-            localSession.messages.push(m);
+            if (
              !localDeletedMessageIds[m.id] ||
              new Date(localDeletedMessageIds[m.id]).toLocaleString() < m.date
            ) {
              localSession.messages.push(m);
            }
          }
        });
        const remoteDeletedMessageIds = remoteSession.deletedMessageIds || {};
        localSession.messages = localSession.messages.filter((localMessage) => {
          return (
            !remoteDeletedMessageIds[localMessage.id] ||
            new Date(localDeletedMessageIds[localMessage.id]).toLocaleString() <
              localMessage.date
          );
        });
        // sort local messages with date field in asc order
        localSession.messages.sort(
          (a, b) => new Date(a.date).getTime() - new Date(b.date).getTime(),
        );
        localSession.lastUpdate = Math.max(
          remoteSession.lastUpdate,
          localSession.lastUpdate,
        );
        const deletedMessageIds = {
          ...remoteDeletedMessageIds,
          ...localDeletedMessageIds,
        };
        removeOutdatedEntries(deletedMessageIds);
        localSession.deletedMessageIds = deletedMessageIds;
      }
    });
    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;
      // 去除掉非首个空会话，避免多个空会话在中间，不方便管理
      if (
        localSession.messages.length === 0 &&
        localSession != localState.sessions[0]
      ) {
        return false;
      }
      // 去除云端删除并且删除时间小于本地修改时间的会话
      return (
        (remoteDeletedSessionIds[localSession.id] || -1) <=
        localSession.lastUpdate
      );
    });
    // sort local sessions with date field in desc order
    localState.sessions.sort(
      (a, b) =>
        new Date(b.lastUpdate).getTime() - new Date(a.lastUpdate).getTime(),
    );
    const deletedSessionIds = {
      ...remoteDeletedSessionIds,
      ...localDeletedSessionIds,
    };
    removeOutdatedEntries(deletedSessionIds);
    localState.deletedSessionIds = deletedSessionIds;
    localState.currentSessionIndex = localState.sessions.findIndex(
      (session) => {
        return session && currentSession && session.id === currentSession.id;
      },
    );
    return localState;
  },
  [StoreKey.Prompt]: (localState, remoteState) => {
@@ -153,9 +226,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
GH Action - Upstream Sync	144fdc9b7c	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-09-13 01:04:37 +00:00
织梦人	35f52886c4	Merge remote-tracking branch 'up/main' # Conflicts: # app/store/chat.ts	2024-09-12 09:19:04 +08:00
织梦人	9551f5dfc6	Merge branch 'website' # Conflicts: # app/components/chat.tsx # app/utils.ts # app/utils/sync.ts	2024-09-07 13:00:33 +08:00
织梦人	370ce3eeca	Merge remote-tracking branch 'up/website' into website # Conflicts: # app/components/chat.tsx # app/utils.ts	2024-09-07 12:51:37 +08:00
织梦人	5ae4921ee0	fix: 优化云同步功能，自动去除掉非首个空会话，避免多个空会话在中间，更方便管理	2024-09-06 20:59:53 +08:00
lloydzhou	6f3d7530b9	Merge remote-tracking branch 'origin/main' into website	2024-09-06 20:18:21 +08:00
织梦人	6dc868154d	fix: 优化云同步功能，使access配置按更新时间合并，解决自定义模型配置在同步后丢失的问题	2024-09-05 21:52:25 +08:00
织梦人	ccacfec918	feat: 优化聊天窗口，使支持复制会话	2024-09-05 21:19:03 +08:00
GH Action - Upstream Sync	c204031ea7	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-09-05 01:04:08 +00:00
GH Action - Upstream Sync	2bf72d0324	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-08-30 01:03:42 +00:00
GH Action - Upstream Sync	e8c7ac0c45	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-08-28 01:02:59 +00:00
GH Action - Upstream Sync	0638db146e	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-08-25 01:06:24 +00:00
GH Action - Upstream Sync	2d68f179d7	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-08-22 01:02:16 +00:00
GH Action - Upstream Sync	f1d69cb312	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-08-21 01:00:45 +00:00
李超	31baa10363	fix: 解决会话列表按最新操作时间倒序排序，当前会话判断失败的bug	2024-08-20 22:23:17 +08:00
李超	2fdb35bcc8	fix: 解决会话列表按最新操作时间倒序排序，当前会话判断失败的bug	2024-08-20 22:21:38 +08:00
李超	5c51fd2ed8	feat: 优化会话列表按最后更新时间倒序排序，更方便查看与管理	2024-08-20 21:19:31 +08:00
李超	d0b7ddc1d6	feat: 优化会话列表按最后更新时间倒序排序，更方便查看与管理	2024-08-20 21:18:28 +08:00
GH Action - Upstream Sync	0745b6498d	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-08-20 01:00:40 +00:00
织梦人	fc97c4b06f	更新docker.yml，使image名自适应，不影响主仓库 (cherry picked from commit `fdb89af355`)	2024-08-18 21:20:20 +08:00
织梦人	fdb89af355	更新docker.yml，使image名自适应，不影响主仓库	2024-08-18 21:19:06 +08:00
织梦人	e515f0f957	更新docker.yml, 修改自动编译的镜像为自己的账号 (cherry picked from commit `b2336f5ed9`)	2024-08-18 20:23:18 +08:00
织梦人	31f282970b	Merge remote-tracking branch 'up/website' into website	2024-08-18 20:22:30 +08:00
织梦人	b2336f5ed9	更新docker.yml, 修改自动编译的镜像为自己的账号	2024-08-18 19:55:55 +08:00
GH Action - Upstream Sync	0a6ddda992	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-08-17 00:59:04 +00:00
lloydzhou	5e1064a5c8	Merge branch 'main' into website	2024-08-16 16:58:30 +08:00
李超	2ee2d50ae6	Merge remote-tracking branch 'up/website' into website	2024-08-15 22:59:03 +08:00
李超	eae593d660	feat: Add automatic data synchronization settings and implementation, enabling auto-sync after completing replies or deleting conversations	2024-08-15 22:42:23 +08:00
织梦人	621b1480c2	Merge branch 'ChatGPTNextWeb:main' into main	2024-08-15 22:41:31 +08:00
李超	4b22aaf979	feat: Add automatic data synchronization settings and implementation, enabling auto-sync after completing replies or deleting conversations	2024-08-15 22:39:30 +08:00
GH Action - Upstream Sync	93bfb55822	Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web	2024-08-14 01:01:30 +00:00
李超	648e60028d	feat: The cloud synchronization feature is enhanced to support the synchronization of deleted conversations and deleted messages	2024-08-08 22:02:15 +08:00
李超	4f876f3e65	Merge tag 'v2.14.1' into website # Conflicts: # app/components/chat.tsx # app/utils.ts	2024-08-08 12:48:36 +08:00
lloydzhou	faac0d9817	Merge remote-tracking branch 'origin/main' into website	2024-08-06 22:45:16 +08:00
李超	22c79595fb	feat: The cloud synchronization feature is enhanced to support the synchronization of deleted conversations and deleted messages	2024-08-03 20:53:36 +08:00
李超	5065091b74	fix: Fixed the issue that WebDAV synchronization could not check the status and failed during the first backup (cherry picked from commit `716899c030`)	2024-08-03 12:41:36 +08:00
李超	22f61295bc	fix: Fixed an issue where the sample of the reply content was displayed out of order (cherry picked from commit `8498cadae8`)	2024-08-03 12:41:36 +08:00
lloydzhou	c440637ad0	Merge remote-tracking branch 'origin/main' into website	2024-07-27 01:32:47 +08:00
lloydzhou	284d33bcdf	Merge remote-tracking branch 'origin/main' into website	2024-07-19 18:37:32 +08:00
lloydzhou	d9573973ca	Merge remote-tracking branch 'origin/main' into website	2024-07-13 21:31:15 +08:00
fred-bf	cd354cf045	Merge pull request #4685 from ChatGPTNextWeb/main feat: update upstream	2024-05-14 17:40:46 +08:00
fred-bf	1cce87acaa	Merge pull request #4181 from ChatGPTNextWeb/main merge main	2024-03-01 11:10:11 +08:00
fred-bf	78c4084501	Merge pull request #4148 from ChatGPTNextWeb/main feat: catch up latest commit	2024-02-27 10:43:15 +08:00
Fred Liang	1d0a40b9e8	chore: low the google safety setting to avoid unexpected blocking	2023-12-31 19:50:06 +08:00