Merge branch 'main' of https://github.com/kwaroran/RisuAI

src/ts/storage/database.ts

@@ -271,7 +271,10 @@ export function setDatabase(data:Database){
         data.autoSuggestPrompt = defaultAutoSuggestPrompt
     }
     if(checkNullish(data.autoSuggestPrefix)){
-        data.autoSuggestPrompt = ""
+        data.autoSuggestPrefix = ""
+    }
+    if(checkNullish(data.autoSuggestClean)){
+        data.autoSuggestClean = true
     }
     if(checkNullish(data.imageCompression)){
         data.imageCompression = true
@@ -460,6 +463,7 @@ export interface botPreset{
     NAISettings?: NAISettings
     autoSuggestPrompt?: string
     autoSuggestPrefix?: string
+    autoSuggestClean?: boolean
 }
 
 export interface Database{
@@ -571,6 +575,7 @@ export interface Database{
     useAutoSuggestions:boolean
     autoSuggestPrompt:string
     autoSuggestPrefix:string
+    autoSuggestClean:boolean
     claudeAPIKey:string,
     useChatCopy:boolean,
     novellistAPI:string,
@@ -885,6 +890,7 @@ export function setPreset(db:Database, newPres: botPreset){
     db.NAIsettings = newPres.NAISettings ?? db.NAIsettings
     db.autoSuggestPrompt = newPres.autoSuggestPrompt ?? db.autoSuggestPrompt
     db.autoSuggestPrefix = newPres.autoSuggestPrefix ?? db.autoSuggestPrefix
+    db.autoSuggestClean = newPres.autoSuggestClean ?? db.autoSuggestClean
     return db
 }
 

src/ts/storage/defaultPrompts.ts

@@ -28,15 +28,5 @@ Out Examples:
 
 Let's read these guidelines step by step three times to be sure we have accurately adhered to the rules.
 `
-export const defaultAutoSuggestPromptOoba = `Write {{user}}'s next responses that meet the following criteria:
-
-1. The purpose, intention, personality, and tendency must be consistent with the previous conversations.
-2. It must contain {{user}}'s response only, NOT {{char}}'s.
-3. The responses should be as diverse as feasible while remaining consistent.
-4. It could be what {{char}} expects or does NOT expect.
-5. It should be interesting and creative while NOT being obvious or boring.
-6. It must make the future development and situation more detailed.
-
-Write 5 possible {{user}}'s next responses in distinct categories.
-Write only one {{user}}'s response per line; each line must start with a hyphen '-'.`
+export const defaultAutoSuggestPromptOoba = `The responses should be interesting and consistent, rather than dull and repetitive. It should be consistent with the context and as unique as possible. The responses could be what {{char}} expects or does not expect. Write 5 possibilities of {{user}}'s following response per line, each reflecting a different alignment. Each line must be only one independent {{user}}'s response, which starts with a hyphen '-'.`
 export const defaultAutoSuggestPrefixOoba = `- "`