diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index 072c5035..9545cae4 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -194,7 +194,7 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model' if(db.useStreaming && arg.useStreaming){ body.stream = true const da = ((!isTauri) && (!isNodeServer) && (!db.usePlainFetch)) - ? await fetch(`/proxy2`, { + ? await fetch(hubURL + `/proxy2`, { body: JSON.stringify(body), headers: { "risu-header": encodeURIComponent(JSON.stringify(headers)), diff --git a/src/ts/process/scripts.ts b/src/ts/process/scripts.ts index e2b2ea96..32332d7c 100644 --- a/src/ts/process/scripts.ts +++ b/src/ts/process/scripts.ts @@ -164,11 +164,8 @@ export function processScriptFull(char:character|groupChat, data:string, mode:Sc } if(p1.startsWith('getvar')){ const v = p1.split("::")[1] - if(chatID !== -1){ - const d =getVarChat(chatID) - console.log(d) - return d[v] ?? "[Null]" - } + const d =getVarChat(chatID) + return d[v] ?? "[Null]" } if(p1.startsWith('calc')){ const v = p1.split("::")[1] diff --git a/src/ts/storage/globalApi.ts b/src/ts/storage/globalApi.ts index 5c4dfb6c..bdf81fd2 100644 --- a/src/ts/storage/globalApi.ts +++ b/src/ts/storage/globalApi.ts @@ -619,7 +619,7 @@ export async function globalFetch(url:string, arg:{plainFetchForce?:boolean,body } } if(arg.rawResponse){ - const furl = `/proxy2` + const furl = ((!isTauri) && (!isNodeServer)) ? `${hubURL}/proxy2` : `/proxy2` const da = await fetch(furl, { body: body, @@ -640,7 +640,7 @@ export async function globalFetch(url:string, arg:{plainFetchForce?:boolean,body } } else{ - const furl = `/proxy2` + const furl = ((!isTauri) && (!isNodeServer)) ? `${hubURL}/proxy2` : `/proxy2` const da = await fetch(furl, { body: body, @@ -731,9 +731,11 @@ export function getUnpargeables(db:Database, uptype:'basename'|'pure' = 'basenam } } - db.personas.map((v) => { - addUnparge(v.icon) - }) + if(db.personas){ + db.personas.map((v) => { + addUnparge(v.icon) + }) + } return unpargeable }