From 1dff7b8149c5b856348fd3484f4feaccbc5b0c40 Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Wed, 24 May 2023 20:06:14 +0900
Subject: [PATCH] [fix] group chat formating and notes

---
 src/lib/SideBars/CharConfig.svelte | 8 ++++----
 src/ts/process/index.ts            | 3 ++-
 src/ts/process/request.ts          | 4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index 312b0ef2..ec686a62 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -178,9 +178,7 @@
         <span class="text-neutral-200">{language.firstMessage} <Help key="charFirstMessage"/></span>
         <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 text-xs resize-none h-20 focus:bg-selected" autocomplete="off" bind:value={currentChar.data.firstMessage}></textarea>
         <span class="text-gray-400 mb-6 text-sm">{tokens.firstMsg} {language.tokens}</span>
-        <span class="text-neutral-200">{language.authorNote} <Help key="chatNote"/></span>
-        <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 focus:bg-selected text-xs" autocomplete="off" bind:value={currentChar.data.chats[currentChar.data.chatPage].note}></textarea>
-        <span class="text-gray-400 mb-6 text-sm">{tokens.localNote} {language.tokens}</span>
+
     {:else}
         <input class="text-neutral-200 mt-2 mb-4 p-2 bg-transparent input-text text-xl focus:bg-selected" placeholder="Group Name" bind:value={currentChar.data.name}>
         <span class="text-neutral-200">{language.character}</span>
@@ -210,7 +208,9 @@
         </div>
 
     {/if}
-                      
+    <span class="text-neutral-200">{language.authorNote} <Help key="chatNote"/></span>
+    <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 focus:bg-selected text-xs" autocomplete="off" bind:value={currentChar.data.chats[currentChar.data.chatPage].note}></textarea>
+    <span class="text-gray-400 mb-6 text-sm">{tokens.localNote} {language.tokens}</span>     
     <div class="flex mt-6 items-center">
         <Check bind:check={$DataBase.jailbreakToggle}/>
         <span class="text-neutral-200 ml-2">{language.jailbreakToggle}</span>
diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts
index c9663178..8158b892 100644
--- a/src/ts/process/index.ts
+++ b/src/ts/process/index.ts
@@ -327,7 +327,8 @@ export async function sendChat(chatProcessIndex = -1):Promise<boolean> {
         formated: formated,
         bias: bias,
         currentChar: currentChar,
-        useStreaming: true
+        useStreaming: true,
+        isGroupChat: nowChatroom.type === 'group'
     }, 'model')
 
     let result = ''
diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index 83dab435..b122f56b 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -17,6 +17,7 @@ interface requestDataArgument{
     PresensePenalty?: number
     frequencyPenalty?: number,
     useStreaming?:boolean
+    isGroupChat?:boolean
 }
 
 type requestDataResponse = {
@@ -57,6 +58,9 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
         case 'gpt4':{
 
             for(let i=0;i<formated.length;i++){
+                if(arg.isGroupChat){
+                    formated[i].content = formated[i].name + ": " + formated[i].content
+                }
                 formated[i].name = undefined
             }