diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7a14d106..9f87b5b0 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "1.83.1" + "version": "1.83.2" }, "tauri": { "allowlist": { diff --git a/src/ts/parser.ts b/src/ts/parser.ts index dda0ddac..36e893d7 100644 --- a/src/ts/parser.ts +++ b/src/ts/parser.ts @@ -638,6 +638,12 @@ const matcher = (p1:string,matcherArg:matcherArg) => { case 'role': { return matcherArg.role ?? 'role' } + case 'jbtoggled':{ + return db.jailbreakToggle ? '1' : '0' + } + case 'random':{ + return Math.random().toString() + } } const arra = p1.split("::") if(arra.length > 1){ @@ -666,7 +672,8 @@ const matcher = (p1:string,matcherArg:matcherArg) => { case 'equal':{ return (arra[1] === arra[2]) ? '1' : '0' } - case 'not_equal':{ + case 'not_equal': + case 'notequal':{ return (arra[1] !== arra[2]) ? '1' : '0' } case 'greater':{ @@ -675,10 +682,12 @@ const matcher = (p1:string,matcherArg:matcherArg) => { case 'less':{ return (Number(arra[1]) < Number(arra[2])) ? '1' : '0' } - case 'greater_equal':{ + case 'greater_equal': + case 'greaterequal':{ return (Number(arra[1]) >= Number(arra[2])) ? '1' : '0' } - case 'less_equal':{ + case 'less_equal': + case 'lessequal':{ return (Number(arra[1]) <= Number(arra[2])) ? '1' : '0' } case 'and':{ @@ -699,6 +708,49 @@ const matcher = (p1:string,matcherArg:matcherArg) => { case 'startswith':{ return arra[1].startsWith(arra[2]) ? '1' : '0' } + case 'endswith':{ + return arra[1].endsWith(arra[2]) ? '1' : '0' + } + case 'contains':{ + return arra[1].includes(arra[2]) ? '1' : '0' + } + case 'replace':{ + return arra[1].replaceAll(arra[2], arra[3]) + } + case 'split':{ + return arra[1].split(arra[2]).join('§') + } + case 'join':{ + return arra[1].split('§').join(arra[2]) + } + case 'length':{ + return arra[1].length.toString() + } + case 'arraylength': + case 'array_length':{ + return arra[1].split('§').length.toString() + } + case 'lower':{ + return arra[1].toLocaleLowerCase() + } + case 'upper':{ + return arra[1].toLocaleUpperCase() + } + case 'capitalize':{ + return arra[1].charAt(0).toUpperCase() + arra[1].slice(1) + } + case 'round':{ + return Math.round(Number(arra[1])).toString() + } + case 'floor':{ + return Math.floor(Number(arra[1])).toString() + } + case 'ceil':{ + return Math.ceil(Number(arra[1])).toString() + } + case 'abs':{ + return Math.abs(Number(arra[1])).toString() + } } } if(p1.startsWith('random')){ diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts index 1ee487bc..c7b03e7b 100644 --- a/src/ts/storage/database.ts +++ b/src/ts/storage/database.ts @@ -15,7 +15,7 @@ import type { OobaChatCompletionRequestParams } from '../model/ooba'; export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = "1.83.1" +export let appVer = "1.83.2" export let webAppSubVer = '' export function setDatabase(data:Database){ diff --git a/version.json b/version.json index 78b02dce..184a78b3 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"1.83.1"} \ No newline at end of file +{"version":"1.83.2"} \ No newline at end of file