From 608dad465b5857d6e9151a31bbb91f8119edf3b3 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Mon, 27 May 2024 11:50:44 +0900
Subject: [PATCH] refactor: Move getCustomToggles to parseKeyValue

---
 src/lib/SideBars/CharConfig.svelte   |  5 ++---
 src/lib/SideBars/SideChatList.svelte |  5 ++---
 src/ts/process/prompt.ts             | 17 -----------------
 src/ts/util.ts                       | 17 +++++++++++++++++
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index f0fa3055..e292f011 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -9,7 +9,7 @@
     import LoreBook from "./LoreBook/LoreBookSetting.svelte";
     import { alertConfirm, alertNormal, alertSelectChar, alertTOS, showHypaV2Alert } from "../../ts/alert";
     import BarIcon from "./BarIcon.svelte";
-    import { findCharacterbyId, getAuthorNoteDefaultText, selectMultipleFile } from "../../ts/util";
+    import { findCharacterbyId, getAuthorNoteDefaultText, parseKeyValue, selectMultipleFile } from "../../ts/util";
     import { onDestroy } from "svelte";
     import {isEqual} from 'lodash'
     import Help from "../Others/Help.svelte";
@@ -29,7 +29,6 @@
     import { updateInlayScreen } from "src/ts/process/inlayScreen";
     import { registerOnnxModel } from "src/ts/process/transformers";
     import MultiLangInput from "../UI/GUI/MultiLangInput.svelte";
-  import { getCustomToggles } from "src/ts/process/prompt";
     
 
     let subMenu = 0
@@ -248,7 +247,7 @@
         <Check bind:check={$DataBase.jailbreakToggle} name={language.jailbreakToggle}/>
     </div>
 
-    {#each getCustomToggles($DataBase.customPromptTemplateToggle) as toggle}
+    {#each parseKeyValue($DataBase.customPromptTemplateToggle) as toggle}
         <div class="flex mt-2 items-center">
             <Check check={$DataBase.globalChatVariables[`toggle_${toggle[0]}`] === '1'} name={toggle[1]} onChange={() => {
                 $DataBase.globalChatVariables[`toggle_${toggle[0]}`] = $DataBase.globalChatVariables[`toggle_${toggle[0]}`] === '1' ? '0' : '1'
diff --git a/src/lib/SideBars/SideChatList.svelte b/src/lib/SideBars/SideChatList.svelte
index abc3474d..09a4e899 100644
--- a/src/lib/SideBars/SideChatList.svelte
+++ b/src/lib/SideBars/SideChatList.svelte
@@ -7,11 +7,10 @@
     import { alertConfirm, alertError, alertSelect } from "src/ts/alert";
     import { language } from "src/lang";
     import Button from "../UI/GUI/Button.svelte";
-    import { findCharacterbyId } from "src/ts/util";
+    import { findCharacterbyId, parseKeyValue } from "src/ts/util";
     import CheckInput from "../UI/GUI/CheckInput.svelte";
     import { createMultiuserRoom } from "src/ts/sync/multiuser";
     import { CurrentCharacter } from "src/ts/stores";
-    import { getCustomToggles } from "src/ts/process/prompt";
     export let chara:character|groupChat
     let editMode = false
 </script>
@@ -111,7 +110,7 @@
                 <CheckInput bind:check={$DataBase.jailbreakToggle} name={language.jailbreakToggle}/>
             </div>
             
-            {#each getCustomToggles($DataBase.customPromptTemplateToggle) as toggle}
+            {#each parseKeyValue($DataBase.customPromptTemplateToggle) as toggle}
                 <div class="flex mt-2 items-center">
                     <CheckInput check={$DataBase.globalChatVariables[`toggle_${toggle[0]}`] === '1'} name={toggle[1]} onChange={() => {
                         $DataBase.globalChatVariables[`toggle_${toggle[0]}`] = $DataBase.globalChatVariables[`toggle_${toggle[0]}`] === '1' ? '0' : '1'
diff --git a/src/ts/process/prompt.ts b/src/ts/process/prompt.ts
index 1998eda6..1b5b1aea 100644
--- a/src/ts/process/prompt.ts
+++ b/src/ts/process/prompt.ts
@@ -64,20 +64,3 @@ export async function tokenizePreset(prompts:PromptItem[], consti:boolean = fals
     }
     return total
 }
-
-export function getCustomToggles(template:string){
-    if(!template){
-        return []
-    }
-
-    const keyValue:[string, string][] = []
-
-    for(const line of template.split('\n')){
-        const [key, value] = line.split('=')
-        if(key && value){
-            keyValue.push([key, value])
-        }
-    }
-
-    return keyValue
-}
\ No newline at end of file
diff --git a/src/ts/util.ts b/src/ts/util.ts
index 0fd2b3ae..1f10848a 100644
--- a/src/ts/util.ts
+++ b/src/ts/util.ts
@@ -967,4 +967,21 @@ export const isKnownUri = (uri:string) => {
             || uri.startsWith('https://')
             || uri.startsWith('ccdefault:')
             || uri.startsWith('embeded://')
+}
+
+export function parseKeyValue(template:string){
+    if(!template){
+        return []
+    }
+
+    const keyValue:[string, string][] = []
+
+    for(const line of template.split('\n')){
+        const [key, value] = line.split('=')
+        if(key && value){
+            keyValue.push([key, value])
+        }
+    }
+
+    return keyValue
 }
\ No newline at end of file