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

refactor: Get current character from db.characters like other functions

Browse Source
This commit is contained in:
enzi221
2025-05-13 16:16:27 +09:00
parent 953fc383f5
commit 5a70dd1566
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ts/process/lua.ts
View File

@@ -487,14 +487,20 @@ export async function runLua(code:string, arg:{
// Lore books // Lore books
luaEngine.global.set('getLoreBookMain', (id:string, search: string) => { luaEngine.global.set('getLoreBookMain', (id:string, search: string) => {
if (char.type !== 'character') { if(!LuaSafeIds.has(id)){
return return
} }
const loreBooks = [...char.chats[char.chatPage]?.localLore ?? [], ...char.globalLore, ...getModuleLorebooks()] const db = getDatabase()
const selectedChar = db.characters[get(selectedCharID)]
if (selectedChar.type !== 'character') {
return
}
const loreBooks = [...selectedChar.chats[selectedChar.chatPage]?.localLore ?? [], ...selectedChar.globalLore, ...getModuleLorebooks()]
const found = loreBooks.find((b) => b.comment === search) const found = loreBooks.find((b) => b.comment === search)
return found ? JSON.stringify({ ...found, content: risuChatParser(found.content, { chara: char }) } satisfies loreBook) : false return found ? JSON.stringify({ ...found, content: risuChatParser(found.content, { chara: selectedChar }) } satisfies loreBook) : false
}) })
luaEngine.global.set('loadLoreBooksMain', async (id:string, usedContext:number) => { luaEngine.global.set('loadLoreBooksMain', async (id:string, usedContext:number) => {
@@ -502,11 +508,14 @@ export async function runLua(code:string, arg:{
return return
} }
if (char.type !== 'character') { const db = getDatabase()
const selectedChar = db.characters[get(selectedCharID)]
if (selectedChar.type !== 'character') {
return return
} }
const db = getDatabase()
const fullLoreBooks = (await loadLoreBookV3Prompt()).actives const fullLoreBooks = (await loadLoreBookV3Prompt()).actives
const maxContext = db.maxContext - usedContext const maxContext = db.maxContext - usedContext
if (maxContext < 0) { if (maxContext < 0) {
@@ -517,7 +526,7 @@ export async function runLua(code:string, arg:{
const loreBooks = [] const loreBooks = []
for (const book of fullLoreBooks) { for (const book of fullLoreBooks) {
const parsed = risuChatParser(book.prompt, { chara: char }).trim() const parsed = risuChatParser(book.prompt, { chara: selectedChar }).trim()
if (parsed.length === 0) { if (parsed.length === 0) {
continue continue
} }