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

fix script processing logic of move_top and move_bottom commands

Browse Source
This commit is contained in:
kwaroran
2024-01-15 13:57:12 +09:00
parent 80113e6463
commit 3745adf9f7
1 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/ts/process/scripts.ts
View File

@@ -84,10 +84,14 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
for (const script of scripts){ for (const script of scripts){
if(script.type === mode){ if(script.type === mode){
const reg = new RegExp(script.in, script.ableFlag ? script.flag : 'g')
let outScript2 = script.out.replaceAll("$n", "\n") let outScript2 = script.out.replaceAll("$n", "\n")
let outScript = risuChatParser(outScript2.replace(dreg, "$&"), {chatID: chatID, db:db}) let outScript = risuChatParser(outScript2.replace(dreg, "$&"), {chatID: chatID, db:db})
let flag = script.ableFlag ? script.flag : 'g'
if(outScript.startsWith('@@move_top') || outScript.startsWith('@@move_bottom')){
flag = flag.replace('g', '') //temperary fix
}
const reg = new RegExp(script.in, flag)
if(outScript.startsWith('@@')){ if(outScript.startsWith('@@')){
if(reg.test(data)){ if(reg.test(data)){
if(outScript.startsWith('@@emo ')){ if(outScript.startsWith('@@emo ')){
@@ -118,15 +122,38 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
selchar.chats[selchar.chatPage].message[chatID].data = data selchar.chats[selchar.chatPage].message[chatID].data = data
data = data.replace(reg, "") data = data.replace(reg, "")
} }
if(outScript.startsWith('@@move_top')){ if(outScript.startsWith('@@move_top') || outScript.startsWith('@@move_bottom')){
const out = outScript.split(' ', 2)[1] const isGlobal = flag.includes('g')
data.replace(reg, '') const matchAll = isGlobal ? data.matchAll(reg) : [data.match(reg)]
data = out + data data = data.replace(reg, "")
} for(const matched of matchAll){
if(outScript.startsWith('@@move_bottom')){ console.log(matched)
const out = outScript.split(' ', 2)[1] if(matched){
data.replace(reg, '') const inData = matched[0]
data = data + out let out = outScript.split(' ', 2)[1]
.replace(/(?<!\$)\$[0-9]+/g, (v)=>{
const index = parseInt(v.substring(1))
if(index < matched.length){
return matched[index]
}
return v
})
.replace(/\$\&/g, inData)
.replace(/(?<!\$)\$<([^>]+)>/g, (v) => {
const groupName = parseInt(v.substring(2, v.length - 1))
if(matched.groups && matched.groups[groupName]){
return matched.groups[groupName]
}
return v
})
if(outScript.startsWith('@@move_top')){
data = out + data
}
else{
data = data + out
}
}
}
} }
} }
else{ else{