fix: change cache timing after lua trigger
This commit is contained in:
@@ -102,11 +102,6 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
|
|||||||
let db = getDatabase()
|
let db = getDatabase()
|
||||||
const originalData = data
|
const originalData = data
|
||||||
const scripts = (db.presetRegex ?? []).concat(char.customscript).concat(getModuleRegexScripts())
|
const scripts = (db.presetRegex ?? []).concat(char.customscript).concat(getModuleRegexScripts())
|
||||||
const hash = generateScriptCacheKey(scripts, data, mode, chatID, cbsConditions)
|
|
||||||
const cached = getScriptCache(hash)
|
|
||||||
if(cached){
|
|
||||||
return {data: cached, emoChanged: false}
|
|
||||||
}
|
|
||||||
let emoChanged = false
|
let emoChanged = false
|
||||||
data = await runLuaEditTrigger(char, mode, data)
|
data = await runLuaEditTrigger(char, mode, data)
|
||||||
|
|
||||||
@@ -138,6 +133,13 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data = risuChatParser(data, { chatID: chatID, cbsConditions })
|
||||||
|
const hash = generateScriptCacheKey(scripts, data, mode, chatID, cbsConditions)
|
||||||
|
const cached = getScriptCache(hash)
|
||||||
|
if(cached){
|
||||||
|
return {data: cached, emoChanged: false}
|
||||||
|
}
|
||||||
|
|
||||||
if(scripts.length === 0){
|
if(scripts.length === 0){
|
||||||
cacheScript(hash, data)
|
cacheScript(hash, data)
|
||||||
@@ -146,6 +148,10 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
|
|||||||
function executeScript(pscript:pScript){
|
function executeScript(pscript:pScript){
|
||||||
const script = pscript.script
|
const script = pscript.script
|
||||||
|
|
||||||
|
if(script.in === '' && script.out !== ''){
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if(script.type === mode){
|
if(script.type === mode){
|
||||||
|
|
||||||
let outScript2 = script.out.replaceAll("$n", "\n")
|
let outScript2 = script.out.replaceAll("$n", "\n")
|
||||||
|
|||||||
Reference in New Issue
Block a user