mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] setvar not working

Browse Source
This commit is contained in:
kwaroran
2023-07-18 01:02:08 +09:00
parent 1f376631d1
commit e676d183ad
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/ChatScreens/Chat.svelte
View File

@@ -56,13 +56,13 @@
async function displaya(message:string){ async function displaya(message:string){
if($DataBase.autoTranslate && $DataBase.translator !== ''){ if($DataBase.autoTranslate && $DataBase.translator !== ''){
if(msgTranslated==='') if(msgTranslated==='')
msgDisplay = risuChatParser(message, {chara: name, chatID: idx}) msgDisplay = risuChatParser(message, {chara: name, chatID: idx, rmVar: true})
msgDisplay = await translate(risuChatParser(message, {chara: name, chatID: idx}), false) msgDisplay = await translate(risuChatParser(message, {chara: name, chatID: idx, rmVar:true}), false)
msgTranslated = msgDisplay msgTranslated = msgDisplay
translated = true; translated = true;
} }
else{ else{
msgDisplay = risuChatParser(message, {chara: name, chatID: idx}) msgDisplay = risuChatParser(message, {chara: name, chatID: idx, rmVar: true})
} }
} }
@@ -130,13 +130,13 @@
translated = true translated = true
return 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 msgTranslated = msgDisplay
translating = false translating = false
translated = true translated = true
} }
else{ else{
msgDisplay = risuChatParser(message, {chara: name, chatID: idx}) msgDisplay = risuChatParser(message, {chara: name, chatID: idx, rmVar:true})
translated = false translated = false
} }
}}> }}>

6
src/ts/parser.ts
View File

@@ -284,6 +284,7 @@ export function risuChatParser(da:string, arg:{
chatID?:number chatID?:number
db?:Database db?:Database
chara?:string|character|groupChat chara?:string|character|groupChat
rmVar?:boolean
} = {}):string{ } = {}):string{
const chatID = arg.chatID ?? -1 const chatID = arg.chatID ?? -1
const db = arg.db ?? get(DataBase) const db = arg.db ?? get(DataBase)
@@ -394,7 +395,10 @@ export function risuChatParser(da:string, arg:{
} }
case 'addvar': case 'addvar':
case 'setvar':{ case 'setvar':{
return '' if(arg.rmVar){
return ''
}
break
} }
case 'button':{ case 'button':{
return `<button style="padding" x-risu-prompt="${arra[2]}">${arra[1]}</button>` return `<button style="padding" x-risu-prompt="${arra[2]}">${arra[1]}</button>`

4
src/ts/process/index.ts
View File

@@ -275,7 +275,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
const chat:OpenAIChat = { const chat:OpenAIChat = {
role: 'assistant', role: 'assistant',
content: processScript(nowChatroom, content: processScript(nowChatroom,
risuChatParser(firstMsg, {chara: currentChar}), risuChatParser(firstMsg, {chara: currentChar, rmVar: true}),
'editprocess') 'editprocess')
} }
chats.push(chat) chats.push(chat)
@@ -284,7 +284,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
const ms = currentChat.message const ms = currentChat.message
for(const msg of ms){ 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 = '' let name = ''
if(msg.role === 'char'){ if(msg.role === 'char'){
if(msg.saying){ if(msg.saying){