Enhance AIChat initialization logic for existing and new chats

YaoApp · Feb 6, 2025 · f86c8a2 · f86c8a2
1 parent 423c3e1
commit f86c8a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/xgen/layouts/components/Neo/components/AIChat/index.tsx b/packages/xgen/layouts/components/Neo/components/AIChat/index.tsx
@@ -125,7 +125,8 @@ const AIChat = (props: AIChatProps) => {
 			if (!initialized && !chat_id) {
 				// if res is not null, create a new chat
 				const res = await getLatestChat(assistant_id)
-				if (res) handleNewChat(res)
+				res && !res.exist && handleNewChat(res) // new chat
+				res && res.exist && setChatId(res.chat_id) // existing chat
 				setInitialized(true)
 			}
 		}

diff --git a/packages/xgen/layouts/components/Neo/hooks/useAIChat.ts b/packages/xgen/layouts/components/Neo/hooks/useAIChat.ts
@@ -981,8 +981,8 @@ export default ({ assistant_id, chat_id, upload_options = {} }: Args) => {
 	/** Get the latest chat ID */
 	const getLatestChat = useMemoizedFn(async function (
 		assistant_id?: string
-	): Promise<{ chat_id: string; placeholder?: App.ChatPlaceholder } | null> {
-		if (!neo_api) return { chat_id: makeChatID(), placeholder: undefined }
+	): Promise<{ chat_id: string; placeholder?: App.ChatPlaceholder; exist?: boolean } | null> {
+		if (!neo_api) return { chat_id: makeChatID(), placeholder: undefined, exist: false }
 
 		const endpoint = `${neo_api}/chats/latest?token=${encodeURIComponent(getToken())}&assistant_id=${
 			assistant_id || ''
@@ -1017,8 +1017,8 @@ export default ({ assistant_id, chat_id, upload_options = {} }: Args) => {
 		setTitle(chatInfo.chat.title || (is_cn ? '未命名' : 'Untitled'))
 
 		// Set chat_id
-		global.setNeoChatId(chatInfo.chat.id)
-		return null
+		global.setNeoChatId(chatInfo.chat.chat_id)
+		return { chat_id: chatInfo.chat.chat_id, exist: true }
 	})
 
 	/** Update Chat **/