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

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

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2023-05-23 01:01:27 +00:00
parent d668ae4103 4e1e1d4fef
commit ea17cec81e
6 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/store/chat.ts
View File

@@ -257,7 +257,12 @@ export const useChatStore = create<ChatStore>()(
});
// get recent messages
const systemMessages = [systemInfo];
const systemMessages = [];
// if user define a mask with context prompts, wont send system info
if (session.mask.context.length === 0) {
systemMessages.push(systemInfo);
}
const recentMessages = get().getMessagesWithMemory();
const sendMessages = systemMessages.concat(
recentMessages.concat(userMessage),
@@ -345,7 +350,7 @@ export const useChatStore = create<ChatStore>()(
// wont send cleared context messages
const clearedContextMessages = session.messages.slice(
(session.clearContextIndex ?? -1) + 1,
session.clearContextIndex ?? 0,
);
const messages = clearedContextMessages.filter((msg) => !msg.isError);
const n = messages.length;