[fix] lorebook replace error 3

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "RisuAI",
-    "version": "1.16.0"
+    "version": "1.16.1"
   },
   "tauri": {
     "allowlist": {

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.0'
+export let appVer = '1.16.1'
 
 
 export function setDatabase(data:Database){

src/ts/process/lorebook.ts

@@ -68,7 +68,7 @@ export async function loadLoreBookPrompt(){
     const characterLore = char.globalLore ?? []
     const chatLore = char.chats[page].localLore ?? []
     const globalLore = db.loreBook[db.loreBookPage].data ?? []
-    const fullLore = [...characterLore, ...chatLore, ...globalLore]
+    const fullLore = characterLore.concat(chatLore)
     const currentChat = char.chats[page].message
     const loreDepth = char.loreSettings?.scanDepth ?? db.loreBookDepth
     const loreToken = char.loreSettings?.tokenBudget ?? db.loreBookToken
@@ -78,13 +78,13 @@ export async function loadLoreBookPrompt(){
     let formatedLore:formatedLore[] = []
 
     for (const lore of fullLore){
-        if(lore && lore.key){
+        if(lore){
             if(lore.key.length > 1 || lore.alwaysActive){
                 formatedLore.push({
-                    keys: lore.alwaysActive ? 'always' : lore.key.replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => {
+                    keys: lore.alwaysActive ? 'always' : (lore.key ?? '').replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => {
                         return a.length > 1
                     }),
-                    secondKey: lore.selective ? lore.secondkey.replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => {
+                    secondKey: lore.selective ? (lore.secondkey ?? '').replace(rmRegex, '').toLocaleLowerCase().split(',').filter((a) => {
                         return a.length > 1
                     }) : [],
                     content: lore.content,

version.json

@@ -1 +1 @@
-{"version":"1.16.0"}
+{"version":"1.16.1"}