From 101a141b482db81d365980fc8add80677c43f044 Mon Sep 17 00:00:00 2001
From: LL <ljh5650@gmail.com>
Date: Fri, 2 Jun 2023 22:51:28 +0900
Subject: [PATCH 1/5] [FIX] Modify auto suggest token count position

---
 src/lib/Setting/Pages/BotSettings.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte
index db53f85e..700d719e 100644
--- a/src/lib/Setting/Pages/BotSettings.svelte
+++ b/src/lib/Setting/Pages/BotSettings.svelte
@@ -146,8 +146,7 @@
     <span class="text-gray-400 mb-6 text-sm">{tokens.jailbreak} {language.tokens}</span>
     <span class="text-neutral-200">{language.globalNote} <Help key="globalNote"/></span>
     <textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.globalNote}></textarea>
-    <span class="text-gray-400 mb-6 text-sm">{tokens.globalNote} {language.tokens}</span>
-    <span class="text-gray-400 mb-6 text-sm">{tokens.autoSuggest} {language.tokens}</span>
+    <span class="text-gray-400 mb-6 text-sm">{tokens.globalNote} {language.tokens}</span>    
 
     <span class="text-neutral-200">{language.maxContextSize}</span>
 {#if $DataBase.aiModel === 'gpt35'}
@@ -175,8 +174,9 @@
 <input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.forceReplaceUrl} placeholder="Leave blank to not replace url">
 <span class="text-neutral-200 mt-2">{language.submodel} {language.forceReplaceUrl} <Help key="forceUrl"/></span>
 <input class="text-neutral-200 p-2 bg-transparent input-text focus:bg-selected text-sm"bind:value={$DataBase.forceReplaceUrl2} placeholder="Leave blank to not replace url">
-<span class="text-neutral-200">{language.autoSuggest} <Help key="autoSuggest"/></span>
-<textarea class="bg-transparent input-text mt-2 mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.autoSuggestPrompt}></textarea>
+<span class="text-neutral-200 mt-2">{language.autoSuggest} <Help key="autoSuggest"/></span>
+<textarea class="bg-transparent input-text mb-2 text-gray-200 resize-none h-20 min-h-20 focus:bg-selected text-xs w-full" autocomplete="off" bind:value={$DataBase.autoSuggestPrompt}></textarea>
+<span class="text-gray-400 mb-6 text-sm">{tokens.autoSuggest} {language.tokens}</span>
 
 {/if}
 

From 251fe4ad47dab67973b7ce305ee60d56114d19c9 Mon Sep 17 00:00:00 2001
From: LL <ljh5650@gmail.com>
Date: Fri, 2 Jun 2023 23:09:43 +0900
Subject: [PATCH 2/5] [UX] Make the settings close button visible regardless of
 scrolling

---
 src/lib/Setting/Settings.svelte | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lib/Setting/Settings.svelte b/src/lib/Setting/Settings.svelte
index e1415237..29874677 100644
--- a/src/lib/Setting/Settings.svelte
+++ b/src/lib/Setting/Settings.svelte
@@ -25,7 +25,7 @@
 
 </script>
 <div class="h-full w-full flex justify-center setting-bg">
-    <div class="h-full max-w-screen-lg w-full flex">
+    <div class="h-full max-w-screen-lg w-full flex relative">
         {#if window.innerWidth >= 700 || selected === -1}
             <div class="flex h-full flex-col p-4 pt-8 bg-darkbg gap-2 overflow-y-auto relative"
                 class:w-full={window.innerWidth < 700}>
@@ -135,17 +135,17 @@
                 {:else if selected === 11}
                     <AccessibilitySettings/>
                 {/if}
-                <button class="absolute top-2 right-2 hover:text-green-500" on:click={() => {
-                    if(window.innerWidth >= 700){
-                        settingsOpen.set(false)
-                    }
-                    else{
-                        selected = -1
-                    }
-                }}>
-                    <XCircleIcon />
-                </button>
             </div>
+            <button class="absolute top-2 right-2 hover:text-green-500 text-white" on:click={() => {
+                if(window.innerWidth >= 700){
+                    settingsOpen.set(false)
+                }
+                else{
+                    selected = -1
+                }
+            }}>
+                <XCircleIcon />
+            </button>            
         {/if}
     </div>
 </div>

From b297268448f571e1db9f1930465cc6ef67835436 Mon Sep 17 00:00:00 2001
From: LL <ljh5650@gmail.com>
Date: Sat, 3 Jun 2023 00:07:59 +0900
Subject: [PATCH 3/5] [UX] Character deletion function menu separation

---
 src/lib/SideBars/CharConfig.svelte | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index ee3f5c19..a9fca5cb 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import { language } from "../../lang";
+	import { language } from "../../lang";
     import { tokenize } from "../../ts/tokenizer";
     import { DataBase, saveImage as saveAsset, type Database, type character, type groupChat } from "../../ts/storage/database";
     import { selectedCharID } from "../../ts/stores";
-    import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBracesIcon, Volume2Icon, XIcon } from 'lucide-svelte'
+    import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBracesIcon, Volume2Icon, XIcon, DeleteIcon } from 'lucide-svelte'
     import Check from "../Others/Check.svelte";
     import { addCharEmotion, addingEmotion, getCharImage, rmCharEmotion, selectCharImg, makeGroupImage } from "../../ts/characters";
     import LoreBook from "./LoreBookSetting.svelte";
@@ -108,7 +108,6 @@
     }
 
     onDestroy(unsub);
-
 </script>
 
 <div class="flex gap-2 mb-2">
@@ -132,6 +131,9 @@
     <button class={subMenu === 2 ? 'text-gray-200' : 'text-gray-500'} on:click={() => {subMenu = 2}}>
         <ActivityIcon />
     </button>
+    <button class={subMenu === 6 ? 'text-red-500' : 'text-red-700'} on:click={() => {subMenu = 6}}>
+        <DeleteIcon />
+    </button>
 </div>
 
 
@@ -676,6 +678,8 @@
             </div>
         {/if}
     {/if}
+{:else if subMenu === 6}
+    <h2 class="mb-2 text-2xl font-bold mt-2">{currentChar.type === 'group' ? language.removeGroup : language.removeCharacter}</h2>
     <button on:click={async () => {
         const conf = await alertConfirm(language.removeConfirm + currentChar.data.name)
         if(!conf){
@@ -690,7 +694,6 @@
         checkCharOrder()
         $selectedCharID = -1
         $DataBase.characters = chars
-
     }} class="text-neutral-200 mt-2 bg-transparent border-solid border-1 border-borderc p-2 hover:bg-draculared transition-colors cursor-pointer">{ currentChar.type === 'group' ? language.removeGroup : language.removeCharacter}</button>
 {/if}
 

From f8516519f3b75d4c5f15040a363410924ae94778 Mon Sep 17 00:00:00 2001
From: LL <ljh5650@gmail.com>
Date: Sat, 3 Jun 2023 02:02:21 +0900
Subject: [PATCH 4/5] Fixed the problem that auto-suggestion does not work for
 firstMessage Fixed the problem that auto-suggestion is not saved

---
 src/lib/ChatScreens/Suggestion.svelte | 35 +++++++++++++++++++--------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/lib/ChatScreens/Suggestion.svelte b/src/lib/ChatScreens/Suggestion.svelte
index 1ad34eab..9ae4309f 100644
--- a/src/lib/ChatScreens/Suggestion.svelte
+++ b/src/lib/ChatScreens/Suggestion.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    import { requestChatData } from "src/ts/process/request";
+	import { requestChatData } from "src/ts/process/request";
     import { doingChat, type OpenAIChat } from "../../ts/process/index";
-    import { DataBase, type character } from "../../ts/storage/database";
+    import { DataBase, setDatabase, type character, type Message, type groupChat, type Database } from "../../ts/storage/database";
     import { selectedCharID } from "../../ts/stores";
     import { translate } from "src/ts/translator/translator";
     import { CopyIcon, LanguagesIcon, RefreshCcwIcon } from "lucide-svelte";
@@ -9,12 +9,14 @@
     import { language } from "src/lang";
     import { replacePlaceholders } from "../../ts/util";
     import { onDestroy } from 'svelte';
+    import { processScript } from "src/ts/process/scripts";
+    import { get } from "svelte/store";
 
     export let send: () => any;
     export let messageInput:(string:string) => any;
-    let suggestMessages = $DataBase.characters[$selectedCharID]?.chats[$DataBase.characters[$selectedCharID].chatPage]?.suggestMessages
+    let suggestMessages:string[] = $DataBase.characters[$selectedCharID]?.chats[$DataBase.characters[$selectedCharID].chatPage]?.suggestMessages
     let suggestMessagesTranslated:string[]
-    let toggleTranslate = $DataBase.autoTranslate
+    let toggleTranslate:boolean = $DataBase.autoTranslate
     let progress:boolean;
     let progressChatPage=-1;
     let abortController:AbortController;
@@ -45,9 +47,20 @@
             suggestMessages = []
         }
         if(!v && $selectedCharID > -1 && (!suggestMessages || suggestMessages.length === 0) && !progress){
-            let currentChar = $DataBase.characters[$selectedCharID] as character;
-            let messages = currentChar.chats[currentChar.chatPage].message;
-            let lastMessages = messages.slice(Math.max(messages.length - 10, 0));
+            let currentChar:character|groupChat = $DataBase.characters[$selectedCharID];
+            let messages:Message[] = []
+            
+            if(currentChar.type !== 'group'){
+                const firstMsg:string = currentChar.firstMsgIndex === -1 ? currentChar.firstMessage : currentChar.alternateGreetings[currentChar.firstMsgIndex]
+                messages.push({
+                    role: 'char',
+                    data: processScript(currentChar,
+                        replacePlaceholders(firstMsg, currentChar.name),
+                    'editprocess')
+                })
+            }
+            messages = [...messages, ...currentChar.chats[currentChar.chatPage].message];
+            let lastMessages:Message[] = messages.slice(Math.max(messages.length - 10, 0));
             if(lastMessages.length === 0)
                 return
             const promptbody:OpenAIChat[] = [
@@ -58,7 +71,7 @@
             ,
             {
                 role: 'user', 
-                content: lastMessages.map(b=>b.role+":"+b.data).reduce((a,b)=>a+','+b)
+                content: lastMessages.map(b=>(b.role==='char'? 'assistant' : 'user')+":"+b.data).reduce((a,b)=>a+','+b)
             }
             ]
 
@@ -68,11 +81,13 @@
             requestChatData({
                 formated: promptbody,
                 bias: {},
-                currentChar
+                currentChar : currentChar as character
             }, 'submodel', abortController.signal).then(rq2=>{
                 if(rq2.type !== 'fail' && rq2.type !== 'streaming' && progress){
                     var suggestMessagesNew = rq2.result.split('\n').filter(msg => msg.startsWith('-')).map(msg => msg.replace('-','').trim())
-                    currentChar.chats[currentChar.chatPage].suggestMessages = suggestMessagesNew
+                    const db:Database = get(DataBase);
+                    db.characters[$selectedCharID].chats[currentChar.chatPage].suggestMessages = suggestMessagesNew
+                    setDatabase(db)
                     suggestMessages = suggestMessagesNew
                 }
                 progress = false

From e12b9da0d98325713bd77c5470961be6fe55f980 Mon Sep 17 00:00:00 2001
From: LL <ljh5650@gmail.com>
Date: Sat, 3 Jun 2023 17:05:31 +0900
Subject: [PATCH 5/5] Revert "[UX] Character deletion function menu separation"

This reverts commit b297268448f571e1db9f1930465cc6ef67835436.
---
 src/lib/SideBars/CharConfig.svelte | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index a9fca5cb..ee3f5c19 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	import { language } from "../../lang";
+    import { language } from "../../lang";
     import { tokenize } from "../../ts/tokenizer";
     import { DataBase, saveImage as saveAsset, type Database, type character, type groupChat } from "../../ts/storage/database";
     import { selectedCharID } from "../../ts/stores";
-    import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBracesIcon, Volume2Icon, XIcon, DeleteIcon } from 'lucide-svelte'
+    import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, LoaderIcon, User, DnaIcon, CurlyBracesIcon, Volume2Icon, XIcon } from 'lucide-svelte'
     import Check from "../Others/Check.svelte";
     import { addCharEmotion, addingEmotion, getCharImage, rmCharEmotion, selectCharImg, makeGroupImage } from "../../ts/characters";
     import LoreBook from "./LoreBookSetting.svelte";
@@ -108,6 +108,7 @@
     }
 
     onDestroy(unsub);
+
 </script>
 
 <div class="flex gap-2 mb-2">
@@ -131,9 +132,6 @@
     <button class={subMenu === 2 ? 'text-gray-200' : 'text-gray-500'} on:click={() => {subMenu = 2}}>
         <ActivityIcon />
     </button>
-    <button class={subMenu === 6 ? 'text-red-500' : 'text-red-700'} on:click={() => {subMenu = 6}}>
-        <DeleteIcon />
-    </button>
 </div>
 
 
@@ -678,8 +676,6 @@
             </div>
         {/if}
     {/if}
-{:else if subMenu === 6}
-    <h2 class="mb-2 text-2xl font-bold mt-2">{currentChar.type === 'group' ? language.removeGroup : language.removeCharacter}</h2>
     <button on:click={async () => {
         const conf = await alertConfirm(language.removeConfirm + currentChar.data.name)
         if(!conf){
@@ -694,6 +690,7 @@
         checkCharOrder()
         $selectedCharID = -1
         $DataBase.characters = chars
+
     }} class="text-neutral-200 mt-2 bg-transparent border-solid border-1 border-borderc p-2 hover:bg-draculared transition-colors cursor-pointer">{ currentChar.type === 'group' ? language.removeGroup : language.removeCharacter}</button>
 {/if}