From e59f8f1fa496bf577b0ad69395f708d53070cf77 Mon Sep 17 00:00:00 2001 From: sub-hub Date: Wed, 12 Jun 2024 23:42:39 +0900 Subject: [PATCH 1/9] Add "button" to the combine translation blacklist --- src/ts/translator/translator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ts/translator/translator.ts b/src/ts/translator/translator.ts index 517b2290..861a5f6b 100644 --- a/src/ts/translator/translator.ts +++ b/src/ts/translator/translator.ts @@ -371,7 +371,7 @@ export async function translateHTML(html: string, reverse:boolean, charArg:simpl node instanceof HTMLElement ) { const children = Array.from(node.childNodes); - const blacklist = ["img", "iframe", "script", "style", "div"]; + const blacklist = ["img", "iframe", "script", "style", "div", "button"]; const hasBlacklistChild = children.some((child) => blacklist.includes(child.nodeName.toLowerCase()) ); From 731da1d2dfe9a4b0091daa91910fdf752e027e0a Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 14 Jun 2024 07:27:07 +0900 Subject: [PATCH 2/9] refactor: Improve array filtering logic in parser.ts --- src/ts/parser.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 03a8a1b0..3e0ee344 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -187,8 +187,10 @@ export async function ParseMarkdown(data:string, charArg:(character|simpleCharac data = await parseInlayImages(data) data = encodeStyle(data) - data = risuFormater(data) - data = mconverted.parse(data) + if(mode !== 'back'){ + data = risuFormater(data) + data = mconverted.parse(data) + } return decodeStyle(DOMPurify.sanitize(data, { ADD_TAGS: ["iframe", "style", "risu-style", "x-em"], ADD_ATTR: ["allow", "allowfullscreen", "frameborder", "scrolling", "risu-btn", 'risu-trigger', 'risu-mark'], From 2ba6e1b54aa1deb564de7d8406ca25689418e273 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 14 Jun 2024 07:28:02 +0900 Subject: [PATCH 3/9] Update version to 114.2.1 --- android/app/build.gradle | 2 +- android/app/release/output-metadata.json | 2 +- src-tauri/tauri.conf.json | 2 +- src/ts/storage/database.ts | 2 +- version.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 3837c82e..451fc57a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -8,7 +8,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 2 - versionName "114.2.0" + versionName "114.2.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json index 1a578006..579ab786 100644 --- a/android/app/release/output-metadata.json +++ b/android/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 2, - "versionName": "114.2.0", + "versionName": "114.2.1", "outputFile": "app-release.apk" } ], diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 662c33e4..f52786bf 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "114.2.0" + "version": "114.2.1" }, "tauri": { "allowlist": { diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index 6d0cdbd5..41eb2c6a 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -14,7 +14,7 @@ import type { OobaChatCompletionRequestParams } from '../model/ooba'; export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = "114.2.0" +export let appVer = "114.2.1" export let webAppSubVer = '' export function setDatabase(data:Database){ diff --git a/version.json b/version.json index 5bc52848..52c8969c 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"114.2.0"} \ No newline at end of file +{"version":"114.2.1"} \ No newline at end of file From 9d1e2bfb28f21600aa8be0bf507b3ab8c1aab527 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 14 Jun 2024 08:15:48 +0900 Subject: [PATCH 4/9] feat: add PlaygroundParser component to PlaygroundMenu --- src/lib/Playground/PlaygroundMenu.svelte | 9 +++++++++ src/lib/Playground/PlaygroundParser.svelte | 23 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 src/lib/Playground/PlaygroundParser.svelte diff --git a/src/lib/Playground/PlaygroundMenu.svelte b/src/lib/Playground/PlaygroundMenu.svelte index cb3ac70e..84f9a699 100644 --- a/src/lib/Playground/PlaygroundMenu.svelte +++ b/src/lib/Playground/PlaygroundMenu.svelte @@ -11,6 +11,7 @@ import { get } from "svelte/store"; import { DataBase, setDatabase, type character } from "src/ts/storage/database"; import PlaygroundImageGen from "./PlaygroundImageGen.svelte"; + import PlaygroundParser from "./PlaygroundParser.svelte"; const playgroundChat = () => { let db = get(DataBase) @@ -75,6 +76,11 @@ }}>

{language.imageGeneration}

+ {:else} {#if $SizeStore.w < 1024} @@ -105,6 +111,9 @@ {#if $PlaygroundStore === 7} {/if} + {#if $PlaygroundStore === 8} + + {/if} {/if} \ No newline at end of file diff --git a/src/lib/Playground/PlaygroundParser.svelte b/src/lib/Playground/PlaygroundParser.svelte new file mode 100644 index 00000000..903b43a3 --- /dev/null +++ b/src/lib/Playground/PlaygroundParser.svelte @@ -0,0 +1,23 @@ + + +

Full Parser

+ +Input + + + +Output HTML + + \ No newline at end of file From 4e4f6c42954588dd15c898dd35b3e446883b9959 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 14 Jun 2024 08:21:42 +0900 Subject: [PATCH 5/9] refactor: Remove duplicated 'unixtime' case in parser.ts --- src/ts/parser.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 3e0ee344..673b41eb 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -763,9 +763,6 @@ const matcher = (p1:string,matcherArg:matcherArg) => { case 'prefill_supported':{ return db.aiModel.startsWith('claude') ? '1' : '0' } - case 'unixtime':{ - return (Date.now() / 1000).toFixed(2) - } case 'screen_width':{ return get(SizeStore).w.toString() } From 27ad0810c484d7feb4274cc1073aee6beddd9237 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 14 Jun 2024 08:27:32 +0900 Subject: [PATCH 6/9] feat: improve pick --- src/ts/parser.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 673b41eb..322d6010 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -1126,7 +1126,7 @@ const matcher = (p1:string,matcherArg:matcherArg) => { } function pickHashRand(cid:number,word:string) { - let hashAddress = cid * 23515 + let hashAddress = 5515 const rand = (word:string) => { for (let counter = 0; counter Date: Fri, 14 Jun 2024 08:30:48 +0900 Subject: [PATCH 7/9] refactor: Improve pickHashRand function in parser.ts --- src/ts/parser.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 322d6010..925226b8 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -1055,9 +1055,9 @@ const matcher = (p1:string,matcherArg:matcherArg) => { if(p1.startsWith('pick')){ const selchar = db.characters[get(selectedCharID)] const selChat = selchar.chats[selchar.chatPage] - const cid = (chatID < 0) ? selChat.message.length : chatID + const cid = selChat.message.length if(p1.startsWith('pick::')){ - const randomIndex = Math.floor(pickHashRand(cid, selchar.chaId) * (arra.length - 1)) + 1 + const randomIndex = Math.floor(pickHashRand(cid, selchar.chaId + (selChat.id ?? '')) * (arra.length - 1)) + 1 if(matcherArg.tokenizeAccurate){ return arra[0] } @@ -1065,7 +1065,7 @@ const matcher = (p1:string,matcherArg:matcherArg) => { } else{ const arr = p1.replace(/\\,/g, '§X').split(/\:|\,/g) - const randomIndex = Math.floor(pickHashRand(cid, selchar.chaId) * (arr.length - 1)) + 1 + const randomIndex = Math.floor(pickHashRand(cid, selchar.chaId + (selChat.id ?? '')) * (arr.length - 1)) + 1 if(matcherArg.tokenizeAccurate){ return arra[0] } @@ -1088,8 +1088,8 @@ const matcher = (p1:string,matcherArg:matcherArg) => { if(p){ const selchar = db.characters[get(selectedCharID)] const selChat = selchar.chats[selchar.chatPage] - const cid = (chatID < 0) ? selChat.message.length : chatID - return (Math.floor(pickHashRand(cid, selchar.chaId) * maxRoll) + 1).toString() + const cid = selChat.message.length + return (Math.floor(pickHashRand(cid, selchar.chaId + (selChat.id ?? '')) * maxRoll) + 1).toString() } return (Math.floor(Math.random() * maxRoll) + 1).toString() } From 4f5171d16c1035065bb9c2cf653bb3a159c24d94 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 14 Jun 2024 08:30:48 +0900 Subject: [PATCH 8/9] refactor: Improve pickHashRand function in parser.ts --- src/ts/parser.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ts/parser.ts b/src/ts/parser.ts index 322d6010..925226b8 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -1055,9 +1055,9 @@ const matcher = (p1:string,matcherArg:matcherArg) => { if(p1.startsWith('pick')){ const selchar = db.characters[get(selectedCharID)] const selChat = selchar.chats[selchar.chatPage] - const cid = (chatID < 0) ? selChat.message.length : chatID + const cid = selChat.message.length if(p1.startsWith('pick::')){ - const randomIndex = Math.floor(pickHashRand(cid, selchar.chaId) * (arra.length - 1)) + 1 + const randomIndex = Math.floor(pickHashRand(cid, selchar.chaId + (selChat.id ?? '')) * (arra.length - 1)) + 1 if(matcherArg.tokenizeAccurate){ return arra[0] } @@ -1065,7 +1065,7 @@ const matcher = (p1:string,matcherArg:matcherArg) => { } else{ const arr = p1.replace(/\\,/g, '§X').split(/\:|\,/g) - const randomIndex = Math.floor(pickHashRand(cid, selchar.chaId) * (arr.length - 1)) + 1 + const randomIndex = Math.floor(pickHashRand(cid, selchar.chaId + (selChat.id ?? '')) * (arr.length - 1)) + 1 if(matcherArg.tokenizeAccurate){ return arra[0] } @@ -1088,8 +1088,8 @@ const matcher = (p1:string,matcherArg:matcherArg) => { if(p){ const selchar = db.characters[get(selectedCharID)] const selChat = selchar.chats[selchar.chatPage] - const cid = (chatID < 0) ? selChat.message.length : chatID - return (Math.floor(pickHashRand(cid, selchar.chaId) * maxRoll) + 1).toString() + const cid = selChat.message.length + return (Math.floor(pickHashRand(cid, selchar.chaId + (selChat.id ?? '')) * maxRoll) + 1).toString() } return (Math.floor(Math.random() * maxRoll) + 1).toString() } From 98d7d19007e25ddab843eff40bdbd5ea1d7eb2af Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 14 Jun 2024 08:32:10 +0900 Subject: [PATCH 9/9] Update version to 114.2.2 --- android/app/build.gradle | 2 +- android/app/release/output-metadata.json | 2 +- src-tauri/tauri.conf.json | 2 +- src/ts/storage/database.ts | 2 +- version.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 451fc57a..972f6dbe 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -8,7 +8,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 2 - versionName "114.2.1" + versionName "114.2.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json index 579ab786..6a926053 100644 --- a/android/app/release/output-metadata.json +++ b/android/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 2, - "versionName": "114.2.1", + "versionName": "114.2.2", "outputFile": "app-release.apk" } ], diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f52786bf..7459728a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "114.2.1" + "version": "114.2.2" }, "tauri": { "allowlist": { diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index 41eb2c6a..23ae5102 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -14,7 +14,7 @@ import type { OobaChatCompletionRequestParams } from '../model/ooba'; export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = "114.2.1" +export let appVer = "114.2.2" export let webAppSubVer = '' export function setDatabase(data:Database){ diff --git a/version.json b/version.json index 52c8969c..693a9ff3 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"114.2.1"} \ No newline at end of file +{"version":"114.2.2"} \ No newline at end of file