From 18175d4d6a85cc72a3c6a5a4e14d43e4e35d2560 Mon Sep 17 00:00:00 2001
From: H0llyW00dzZ <priv8@btz.pm>
Date: Sun, 15 Oct 2023 17:51:48 +0700
Subject: [PATCH] Fix & Feat UI Page Chat [Json Exporter]

[+] fix(exporter.tsx): remove system message in JsonPreviewer component
[+] feat(chat.ts): add system message after updating current session topic for all models
---
 app/components/exporter.tsx |  4 ----
 app/store/chat.ts           | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/components/exporter.tsx b/app/components/exporter.tsx
index d6f345941..d0d9b7438 100644
--- a/app/components/exporter.tsx
+++ b/app/components/exporter.tsx
@@ -619,10 +619,6 @@ export function JsonPreviewer(props: {
 }) {
   const msgs = {
     messages: [
-      {
-        role: "system",
-        content: `${Locale.FineTuned.Sysmessage} ${props.topic}`,
-      },
       ...props.messages.map((m) => ({
         role: m.role,
         content: m.content,
diff --git a/app/store/chat.ts b/app/store/chat.ts
index 56ac8db6c..4ec53bb13 100644
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@@ -519,10 +519,18 @@ export const useChatStore = createPersistStore(
             },
             onFinish(message) {
               get().updateCurrentSession(
-                (session) =>
-                  (session.topic =
-                    message.length > 0 ? trimTopic(message) : DEFAULT_TOPIC),
-              );
+                (session) => {
+                  session.topic =
+                    message.length > 0 ? trimTopic(message) : DEFAULT_TOPIC;
+                  // Add system message after summarizing the topic
+                  const systemMessage: ChatMessage = {
+                    role: "system",
+                    content: `${Locale.FineTuned.Sysmessage} ${session.topic}`,
+                    date: new Date().toLocaleString(),
+                    id: nanoid(),
+                  };
+                  session.messages = [systemMessage, ...session.messages];
+                });
             },
           });
         }