diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c9c86968..da432e2d 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -29,7 +29,7 @@ }, "productName": "RisuAI", "mainBinaryName": "RisuAI", - "version": "145.2.0", + "version": "145.3.0", "identifier": "co.aiclient.risu", "plugins": { "updater": { diff --git a/src/lib/UI/Title.svelte b/src/lib/UI/Title.svelte index d3da7cba..faabb5b1 100644 --- a/src/lib/UI/Title.svelte +++ b/src/lib/UI/Title.svelte @@ -38,38 +38,7 @@ const onClick = () => { if(specialDay === 'newYear'){ - const db = DBState.db - let messages = 0 - let chats = 0 - if(db.statistics?.newYear2024){ - const markdown = ` -# Happy New Year! -You've had: -- Sent over ${db.statistics.newYear2024.messages.toLocaleString()} messages -- Played over ${db.statistics.newYear2024.chats.toLocaleString()} chats -*Statistics are approximate* - ` - alertMd(markdown) - return - } - db.characters.map((c) => { - c.chats.map((chat) => { - messages += chat.message.length - }) - chats += c.chats.length - }) - const markdown = ` -# Happy New Year! -You've had: -- Sent over ${messages.toLocaleString()} messages -- Played over ${chats.toLocaleString()} chats -*Statistics are approximate* - ` - db.statistics.newYear2024 = { - messages, - chats - } - alertMd(markdown) + } } diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index e68647c7..ba03c381 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -227,16 +227,28 @@ export async function requestChatData(arg:requestDataArgument, model:ModelModeEx } if(da.type === 'success' && db.banCharacterset?.length > 0){ + let failed = false for(const set of db.banCharacterset){ + console.log(set) const checkRegex = new RegExp(`\\p{Script=${set}}`, 'gu') if(checkRegex.test(da.result)){ - return { - type: 'fail', - result: 'Banned character found' + trys += 1 + if(trys > db.requestRetrys){ + return { + type: 'fail', + result: 'Banned character found, retry limit reached' + } } + + failed = true + break } } + + if(failed){ + continue + } } diff --git a/src/ts/storage/database.svelte.ts b/src/ts/storage/database.svelte.ts index f56ac85d..b717fa1f 100644 --- a/src/ts/storage/database.svelte.ts +++ b/src/ts/storage/database.svelte.ts @@ -12,7 +12,7 @@ import { defaultColorScheme, type ColorScheme } from '../gui/colorscheme'; import type { PromptItem, PromptSettings } from '../process/prompt'; import type { OobaChatCompletionRequestParams } from '../model/ooba'; -export let appVer = "145.2.0" +export let appVer = "145.3.0" export let webAppSubVer = '' diff --git a/version.json b/version.json index 1cf63f70..e53c4347 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"145.2.0"} \ No newline at end of file +{"version":"145.3.0"} \ No newline at end of file