diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 8436439c..c6eeb1b7 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "1.16.1" + "version": "1.16.3" }, "tauri": { "allowlist": { diff --git a/src/ts/database.ts b/src/ts/database.ts index 55c639f1..21fd5a85 100644 --- a/src/ts/database.ts +++ b/src/ts/database.ts @@ -7,7 +7,7 @@ import { cloneDeep } from 'lodash'; export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = '1.16.1' +export let appVer = '1.16.3' export function setDatabase(data:Database){ diff --git a/src/ts/process/lorebook.ts b/src/ts/process/lorebook.ts index d4fa7467..63cb7bba 100644 --- a/src/ts/process/lorebook.ts +++ b/src/ts/process/lorebook.ts @@ -67,8 +67,8 @@ export async function loadLoreBookPrompt(){ const page = char.chatPage const characterLore = char.globalLore ?? [] const chatLore = char.chats[page].localLore ?? [] - const globalLore = db.loreBook[db.loreBookPage].data ?? [] - const fullLore = characterLore.concat(chatLore) + const globalLore = db.loreBook[db.loreBookPage]?.data ?? [] + const fullLore = characterLore.concat(chatLore.concat(globalLore)) const currentChat = char.chats[page].message const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken diff --git a/version.json b/version.json index cfaa627d..580d1419 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"1.16.1"} \ No newline at end of file +{"version":"1.16.3"} \ No newline at end of file