From e676d183ad4e2c82576c885825622c07ae49780e Mon Sep 17 00:00:00 2001
From: kwaroran <kwaworan@gmail.com>
Date: Tue, 18 Jul 2023 01:02:08 +0900
Subject: [PATCH] [fix] setvar not working

---
 src/lib/ChatScreens/Chat.svelte | 10 +++++-----
 src/ts/parser.ts                |  6 +++++-
 src/ts/process/index.ts         |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte
index 1342f104..feefe8b4 100644
--- a/src/lib/ChatScreens/Chat.svelte
+++ b/src/lib/ChatScreens/Chat.svelte
@@ -56,13 +56,13 @@
     async function displaya(message:string){
         if($DataBase.autoTranslate && $DataBase.translator !== ''){
             if(msgTranslated==='')
-                msgDisplay = risuChatParser(message, {chara: name, chatID: idx})
-            msgDisplay = await translate(risuChatParser(message, {chara: name, chatID: idx}), false)
+                msgDisplay = risuChatParser(message, {chara: name, chatID: idx, rmVar: true})
+            msgDisplay = await translate(risuChatParser(message, {chara: name, chatID: idx, rmVar:true}), false)
             msgTranslated = msgDisplay
             translated = true;
         }
         else{
-            msgDisplay = risuChatParser(message, {chara: name, chatID: idx})
+            msgDisplay = risuChatParser(message, {chara: name, chatID: idx, rmVar: true})
         }
     }
 
@@ -130,13 +130,13 @@
                                     translated = true
                                     return
                                 }
-                                msgDisplay = (await translate(risuChatParser(message, {chara: name, chatID: idx}), false))
+                                msgDisplay = (await translate(risuChatParser(message, {chara: name, chatID: idx, rmVar: true}), false))
                                 msgTranslated = msgDisplay
                                 translating = false
                                 translated = true
                             }
                             else{
-                                msgDisplay = risuChatParser(message, {chara: name, chatID: idx})
+                                msgDisplay = risuChatParser(message, {chara: name, chatID: idx, rmVar:true})
                                 translated = false
                             }
                         }}>
diff --git a/src/ts/parser.ts b/src/ts/parser.ts
index af081bae..11c34cbe 100644
--- a/src/ts/parser.ts
+++ b/src/ts/parser.ts
@@ -284,6 +284,7 @@ export function risuChatParser(da:string, arg:{
     chatID?:number
     db?:Database
     chara?:string|character|groupChat
+    rmVar?:boolean
 } = {}):string{
     const chatID = arg.chatID ?? -1
     const db = arg.db ?? get(DataBase)
@@ -394,7 +395,10 @@ export function risuChatParser(da:string, arg:{
                 }
                 case 'addvar':
                 case 'setvar':{
-                    return ''
+                    if(arg.rmVar){
+                        return ''
+                    }
+                    break
                 }
                 case 'button':{
                     return `<button style="padding" x-risu-prompt="${arra[2]}">${arra[1]}</button>`
diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts
index ceb2dbd7..e5654363 100644
--- a/src/ts/process/index.ts
+++ b/src/ts/process/index.ts
@@ -275,7 +275,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
         const chat:OpenAIChat = {
             role: 'assistant',
             content: processScript(nowChatroom,
-                risuChatParser(firstMsg, {chara: currentChar}),
+                risuChatParser(firstMsg, {chara: currentChar, rmVar: true}),
             'editprocess')
         }
         chats.push(chat)
@@ -284,7 +284,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
 
     const ms = currentChat.message
     for(const msg of ms){
-        let formedChat = processScript(nowChatroom,risuChatParser(msg.data, {chara: currentChar}), 'editprocess')
+        let formedChat = processScript(nowChatroom,risuChatParser(msg.data, {chara: currentChar, rmVar: true}), 'editprocess')
         let name = ''
         if(msg.role === 'char'){
             if(msg.saying){