{#key charas}
diff --git a/src/preload.ts b/src/preload.ts
index 53b9190e..456316f2 100644
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -4,7 +4,7 @@ export function preLoadCheck(){
const searchParams = new URLSearchParams(location.search);
//@ts-ignore
- const isTauri = !!window.__TAURI__
+ const isTauri = !!window.__TAURI_INTERNALS__
//@ts-ignore
const isNodeServer = !!globalThis.__NODE__
const isCapacitor = Capacitor.isNativePlatform();
@@ -19,6 +19,15 @@ export function preLoadCheck(){
else if(searchParams.has('mainpage')) {
localStorage.setItem('mainpage', searchParams.get('mainpage'));
}
+
+ if(isWeb) {
+ //Add beforeunload event listener to prevent the user from leaving the page
+ window.addEventListener('beforeunload', (e) => {
+ e.preventDefault()
+ //legacy browser
+ e.returnValue = true
+ })
+ }
// Redirect to the main page if the user has not visited the main page
diff --git a/src/styles.css b/src/styles.css
index 97e87ca7..4a8eaab9 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -242,4 +242,16 @@ html, body{
background-color: var(--tw-prose-pre-bg);
padding: 0.125rem 0.25rem;
border-radius: 0.25rem;
+}
+
+.x-risu-risu-inlay-image{
+ @apply w-full flex justify-center
+}
+
+.x-risu-risu-inlay-image > img{
+ @apply rounded-lg focus:outline-none max-w-80 w-full
+}
+
+.z-100{
+ z-index: 100;
}
\ No newline at end of file
diff --git a/src/ts/alert.ts b/src/ts/alert.ts
index 25abb1d2..30049793 100644
--- a/src/ts/alert.ts
+++ b/src/ts/alert.ts
@@ -246,7 +246,7 @@ export async function alertCardExport(type:string = ''){
export async function alertTOS(){
- if(localStorage.getItem('tos') === 'true'){
+ if(localStorage.getItem('tos2') === 'true'){
return true
}
@@ -263,7 +263,7 @@ export async function alertTOS(){
}
if(get(alertStore).msg === 'yes'){
- localStorage.setItem('tos', 'true')
+ localStorage.setItem('tos2', 'true')
return true
}
diff --git a/src/ts/characterCards.ts b/src/ts/characterCards.ts
index ffe37d8e..dfe3deda 100644
--- a/src/ts/characterCards.ts
+++ b/src/ts/characterCards.ts
@@ -14,6 +14,9 @@ import { PngChunk } from "./pngChunk"
import type { OnnxModelFiles } from "./process/transformers"
import { CharXReader, CharXWriter } from "./process/processzip"
import { Capacitor } from "@capacitor/core"
+import { exportModule, readModule, type RisuModule } from "./process/modules"
+import { readFile } from "@tauri-apps/plugin-fs"
+import { onOpenUrl } from '@tauri-apps/plugin-deep-link';
export const hubURL = "https://sv.risuai.xyz"
@@ -65,6 +68,9 @@ async function importCharacterProcess(f:{
}
}
+ let db = get(DataBase)
+ db.statics.imports += 1
+
if(f.name.endsWith('charx')){
console.log('reading charx')
alertStore.set({
@@ -80,11 +86,18 @@ async function importCharacterProcess(f:{
alertError(language.errors.noData)
return
}
- const card = JSON.parse(cardData)
+ const card:CharacterCardV3 = JSON.parse(cardData)
if(CCardLib.character.check(card) !== 'v3'){
alertError(language.errors.noData)
return
}
+ if(reader.moduleData){
+ const md = await readModule(Buffer.from(reader.moduleData))
+ card.data.extensions ??= {}
+ card.data.extensions.risuai ??= {}
+ card.data.extensions.risuai.triggerscript = md.trigger ?? []
+ card.data.extensions.risuai.customScripts = md.regex ?? []
+ }
await importCharacterCardSpec(card, undefined, 'normal', reader.assets)
let db = get(DataBase)
return db.characters.length - 1
@@ -133,7 +146,7 @@ async function importCharacterProcess(f:{
continue
}
if(chunk.key.startsWith('chara-ext-asset_')){
- const assetIndex = (chunk.key.replace('chara-ext-asset_', ''))
+ const assetIndex = chunk.key.replace('chara-ext-asset_:', '').replace('chara-ext-asset_', '')
alertWait('Loading... (Reading Asset ' + assetIndex + ')' )
const assetData = Buffer.from(chunk.value, 'base64')
const assetId = await saveAsset(assetData)
@@ -145,7 +158,7 @@ async function importCharacterProcess(f:{
return
}
- if(!readedChara){
+ if(readedCCv3){
readedChara = readedCCv3
}
@@ -226,7 +239,6 @@ async function importCharacterProcess(f:{
const charaData:OldTavernChar = JSON.parse(Buffer.from(readedChara, 'base64').toString('utf-8'))
console.log(charaData)
const imgp = await saveAsset(await reencodeImage(img))
- let db = get(DataBase)
db.characters.push(convertOffSpecCards(charaData, imgp))
DataBase.set(db)
alertNormal(language.importedCharacter)
@@ -289,6 +301,14 @@ export async function characterURLImport() {
const hash = location.hash
+ if(hash.startsWith('#import=')){
+ const url = hash.replace('#import=', '')
+ const res = await fetch(url, {
+ method: 'GET',
+ })
+ const data = new Uint8Array(await res.arrayBuffer())
+ importFile(getFileName(res), data)
+ }
if(hash.startsWith('#import_module=')){
const data = hash.replace('#import_module=', '')
const importData = JSON.parse(Buffer.from(decodeURIComponent(data), 'base64').toString('utf-8'))
@@ -304,7 +324,7 @@ export async function characterURLImport() {
db.modules.push(importData)
setDatabase(db)
alertNormal(language.successImport)
- SettingsMenuIndex.set(1)
+ SettingsMenuIndex.set(14)
settingsOpen.set(true)
return
}
@@ -315,10 +335,148 @@ export async function characterURLImport() {
name: 'imported.risupreset',
data: importData
})
- SettingsMenuIndex.set(14)
+ SettingsMenuIndex.set(1)
settingsOpen.set(true)
return
+ }
+ if(hash.startsWith('#share_character')){
+ const data = await fetch("/sw/share/character")
+ if(data.status !== 200){
+ return
+ }
+ const charx = new Uint8Array(await data.arrayBuffer())
+ await importCharacterProcess({
+ name: 'shared.charx',
+ data: charx
+ })
+ }
+ if(hash.startsWith('#share_module')){
+ const data = await fetch("/sw/share/module")
+ if(data.status !== 200){
+ return
+ }
+ const module = new Uint8Array(await data.arrayBuffer())
+ const md = await readModule(Buffer.from(module))
+ md.id = v4()
+ const db = get(DataBase)
+ db.modules.push(md)
+ setDatabase(db)
+ alertNormal(language.successImport)
+ SettingsMenuIndex.set(14)
+ settingsOpen.set(true)
+ }
+ if(hash.startsWith('#share_preset')){
+ const data = await fetch("/sw/share/preset")
+ if(data.status !== 200){
+ return
+ }
+ const preset = new Uint8Array(await data.arrayBuffer())
+ await importPreset({
+ name: 'shared.risup',
+ data: preset
+ })
+ SettingsMenuIndex.set(1)
+ settingsOpen.set(true)
+ }
+ if ("launchQueue" in window) {
+ const handleFiles = async (files:FileSystemFileHandle[]) => {
+ for(const f of files){
+ const file = await f.getFile()
+ const data = new Uint8Array(await file.arrayBuffer())
+ importFile(f.name, data);
+ }
+ }
+ //@ts-ignore
+ window.launchQueue.setConsumer((launchParams) => {
+ if (launchParams.files && launchParams.files.length) {
+ const files = launchParams.files as FileSystemFileHandle[]
+ handleFiles(files)
+ }
+ });
+ }
+
+ if("tauriOpenedFiles" in window){
+ //@ts-ignore
+ const files:string[] = window.tauriOpenedFiles
+ if(files){
+ for(const file of files){
+ const data = await readFile(file)
+ importFile(file, data)
+ }
+ }
+ }
+ if(isTauri){
+ await onOpenUrl((urls) => {
+ for(const url of urls){
+ const splited = url.split('/')
+ const id = splited[splited.length - 1]
+ const type = splited[splited.length - 2]
+ switch(type){
+ case 'realm':{
+ downloadRisuHub(id)
+ }
+ }
+ }
+ })
+ }
+
+ async function importFile(name:string, data:Uint8Array) {
+ if(name.endsWith('.charx') || name.endsWith('.png')){
+ await importCharacterProcess({
+ name: name,
+ data: data
+ })
+ return
+ }
+ if(name.endsWith('.risupreset') || name.endsWith('.risup')){
+ await importPreset({
+ name: name,
+ data: data
+ })
+ SettingsMenuIndex.set(1)
+ settingsOpen.set(true)
+ alertNormal(language.successImport)
+ return
+ }
+ if(name.endsWith('risum')){
+ const md = await readModule(Buffer.from(data))
+ md.id = v4()
+ const db = get(DataBase)
+ db.modules.push(md)
+ setDatabase(db)
+ alertNormal(language.successImport)
+ SettingsMenuIndex.set(14)
+ settingsOpen.set(true)
+ return
+ }
+ }
+
+ function getFileName(res : Response) : string {
+ return getFormContent(res.headers.get('content-disposition')) || getFromURL(res.url);
+
+ function getFormContent(contentDisposition : string) {
+ if (!contentDisposition) return null;
+ const pattern = /filename\*=UTF-8''([^"';\n]+)|filename[^;\n=]*=["']?([^"';\n]+)["']?/;
+ const matches = contentDisposition.match(pattern);
+ if (matches) {
+ if (matches[1]) {
+ return decodeURIComponent(matches[1]);
+ } else if (matches[2]) {
+ return matches[2];
+ }
+ }
+ return null;
+ }
+
+ function getFromURL(url : string) : string {
+ try {
+ const path = new URL(url).pathname;
+ return path.substring(path.lastIndexOf('/') + 1);
+ } catch {
+ return "";
+ }
+ }
}
}
@@ -326,6 +484,43 @@ export async function characterURLImport() {
function convertOffSpecCards(charaData:OldTavernChar|CharacterCardV2Risu, imgp:string|undefined = undefined):character{
const data = charaData.spec_version === '2.0' ? charaData.data : charaData
console.log("Off spec detected, converting")
+ const charbook = charaData.spec_version === '2.0' ? charaData.data.character_book : null
+ let lorebook:loreBook[] = []
+ let loresettings:undefined|loreSettings = undefined
+ let loreExt:undefined|any = undefined
+ if(charbook){
+ if((!checkNullish(charbook.recursive_scanning)) &&
+ (!checkNullish(charbook.scan_depth)) &&
+ (!checkNullish(charbook.token_budget))){
+ loresettings = {
+ tokenBudget:charbook.token_budget,
+ scanDepth:charbook.scan_depth,
+ recursiveScanning: charbook.recursive_scanning,
+ fullWordMatching: charbook?.extensions?.risu_fullWordMatching ?? false,
+ }
+ }
+
+ loreExt = charbook.extensions
+
+ for(const book of charbook.entries){
+ lorebook.push({
+ key: book.keys.join(', '),
+ secondkey: book.secondary_keys?.join(', ') ?? '',
+ insertorder: book.insertion_order,
+ comment: book.name ?? book.comment ?? "",
+ content: book.content,
+ mode: "normal",
+ alwaysActive: book.constant ?? false,
+ selective: book.selective ?? false,
+ extentions: {...book.extensions, risu_case_sensitive: book.case_sensitive},
+ activationPercent: book.extensions?.risu_activationPercent,
+ loreCache: book.extensions?.risu_loreCache ?? null,
+ //@ts-ignore
+ useRegex: book.use_regex ?? false
+ })
+ }
+ }
+
return {
name: data.name ?? 'unknown name',
firstMessage: data.first_mes ?? 'unknown first message',
@@ -341,7 +536,7 @@ function convertOffSpecCards(charaData:OldTavernChar|CharacterCardV2Risu, imgp:s
image: imgp,
emotionImages: [],
bias: [],
- globalLore: [],
+ globalLore: lorebook,
viewScreen: 'none',
chaId: uuidv4(),
sdData: defaultSdDataFunc(),
@@ -360,7 +555,10 @@ function convertOffSpecCards(charaData:OldTavernChar|CharacterCardV2Risu, imgp:s
firstMsgIndex: -1,
replaceGlobalNote: "",
triggerscript: [],
- additionalText: ''
+ additionalText: '',
+ loreExt: loreExt,
+ loreSettings: loresettings,
+
}
}
@@ -663,7 +861,7 @@ async function importCharacterCardSpec(card:CharacterCardV2Risu|CharacterCardV3,
alternateGreetings:data.alternate_greetings ?? [],
tags:data.tags ?? [],
creator:data.creator ?? '',
- characterVersion: `${data.character_version}` ?? '',
+ characterVersion: `${data.character_version}` || '',
personality:data.personality ?? '',
scenario:data.scenario ?? '',
firstMsgIndex: -1,
@@ -775,7 +973,7 @@ async function createBaseV2(char:character) {
},
tags: char.tags ?? [],
creator: char.additionalData?.creator ?? '',
- character_version: `${char.additionalData?.character_version}` ?? '',
+ character_version: `${char.additionalData?.character_version}` || '',
extensions: {
risuai: {
// emotions: char.emotionImages,
@@ -850,7 +1048,7 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
const b64encoded = Buffer.from(await convertImage(rData)).toString('base64')
assetIndex++
card.data.extensions.risuai.emotions[i][1] = `__asset:${assetIndex}`
- await writer.write("chara-ext-asset_" + assetIndex, b64encoded)
+ await writer.write("chara-ext-asset_:" + assetIndex, b64encoded)
}
}
@@ -866,7 +1064,7 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
const b64encoded = Buffer.from(await convertImage(rData)).toString('base64')
assetIndex++
card.data.extensions.risuai.additionalAssets[i][1] = `__asset:${assetIndex}`
- await writer.write("chara-ext-asset_" + assetIndex, b64encoded)
+ await writer.write("chara-ext-asset_:" + assetIndex, b64encoded)
}
}
@@ -882,7 +1080,7 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
const b64encoded = Buffer.from(rData).toString('base64')
assetIndex++
card.data.extensions.risuai.vits[key] = `__asset:${assetIndex}`
- await writer.write("chara-ext-asset_" + assetIndex, b64encoded)
+ await writer.write("chara-ext-asset_:" + assetIndex, b64encoded)
}
}
if(type === 'json'){
@@ -923,7 +1121,7 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
if(type === 'png'){
const b64encoded = Buffer.from(await convertImage(rData)).toString('base64')
card.data.assets[i].uri = `__asset:${assetIndex}`
- await writer.write("chara-ext-asset_" + assetIndex, b64encoded)
+ await writer.write("chara-ext-asset_:" + assetIndex, b64encoded)
}
else if(type === 'json'){
const b64encoded = Buffer.from(await convertImage(rData)).toString('base64')
@@ -1015,6 +1213,20 @@ export async function exportCharacterCard(char:character, type:'png'|'json'|'cha
})
if(type === 'charx'){
+ const md:RisuModule = {
+ name: `${char.name} Module`,
+ description: "Module for " + char.name,
+ id: v4(),
+ trigger: card.data.extensions.risuai.triggerscript ?? [],
+ regex: card.data.extensions.risuai.customScripts ?? [],
+ lorebook: char.globalLore ?? [],
+ }
+ delete card.data.extensions.risuai.triggerscript
+ delete card.data.extensions.risuai.customScripts
+ await writer.write("module.risum", await exportModule(md, {
+ alertEnd: false,
+ saveData: false
+ }))
await writer.write("card.json", Buffer.from(JSON.stringify(card, null, 4)))
}
else{
@@ -1131,7 +1343,7 @@ export function createBaseV3(char:character){
},
tags: char.tags ?? [],
creator: char.additionalData?.creator ?? '',
- character_version: `${char.additionalData?.character_version}` ?? '',
+ character_version: `${char.additionalData?.character_version}` || '',
extensions: {
risuai: {
bias: char.bias,
diff --git a/src/ts/characters.ts b/src/ts/characters.ts
index ac80e335..653a44bc 100644
--- a/src/ts/characters.ts
+++ b/src/ts/characters.ts
@@ -1,17 +1,19 @@
import { get, writable } from "svelte/store";
import { DataBase, saveImage, setDatabase, type character, type Chat, defaultSdDataFunc, type loreBook } from "./storage/database";
-import { alertConfirm, alertError, alertNormal, alertSelect, alertStore, alertWait } from "./alert";
+import { alertAddCharacter, alertConfirm, alertError, alertNormal, alertSelect, alertStore, alertWait } from "./alert";
import { language } from "../lang";
import { decode as decodeMsgpack } from "msgpackr";
import { checkNullish, findCharacterbyId, getUserName, selectMultipleFile, selectSingleFile, sleep } from "./util";
import { v4 as uuidv4 } from 'uuid';
-import { selectedCharID } from "./stores";
+import { MobileGUIStack, OpenRealmStore, selectedCharID } from "./stores";
import { checkCharOrder, downloadFile, getFileSrc } from "./storage/globalApi";
import { reencodeImage } from "./process/files/image";
import { updateInlayScreen } from "./process/inlayScreen";
import { PngChunk } from "./pngChunk";
import { parseMarkdownSafe } from "./parser";
import { translateHTML } from "./translator/translator";
+import { doingChat } from "./process";
+import { importCharacter } from "./characterCards";
export function createNewCharacter() {
let db = get(DataBase)
@@ -247,7 +249,7 @@ export async function exportChat(page:number){
${char.name}
${await htmlChatParse(
- char.firstMsgIndex === -1 ? char.firstMessage : char.alternateGreetings?.[char.firstMsgIndex ?? 0]
+ chat.fmIndex === -1 ? char.firstMessage : char.alternateGreetings?.[chat.fmIndex ?? 0]
)}
${chatContentHTML}
@@ -341,7 +343,8 @@ export async function importChat(){
message: [],
note: "",
name: "Imported Chat",
- localLore: []
+ localLore: [],
+ fmIndex: -1
}
let isFirst = true
@@ -374,6 +377,7 @@ export async function importChat(){
if(json.type === 'risuChat' && json.ver === 1){
const das:Chat = json.data
if(!(checkNullish(das.message) || checkNullish(das.note) || checkNullish(das.name) || checkNullish(das.localLore))){
+ das.fmIndex ??= -1
db.characters[selectedID].chats.unshift(das)
setDatabase(db)
alertNormal(language.successImport)
@@ -412,7 +416,9 @@ function formatTavernChat(chat:string, charName:string){
return chat.replace(/<([Uu]ser)>|\{\{([Uu]ser)\}\}/g, getUserName()).replace(/((\{\{)|<)([Cc]har)(=.+)?((\}\})|>)/g, charName)
}
-export function characterFormatUpdate(index:number|character){
+export function characterFormatUpdate(index:number|character, arg:{
+ updateInteraction?:boolean,
+} = {}){
let db = get(DataBase)
let cha = typeof(index) === 'number' ? db.characters[index] : index
if(cha.chats.length === 0){
@@ -504,10 +510,15 @@ export function characterFormatUpdate(index:number|character){
if(checkNullish(cha.customscript)){
cha.customscript = []
}
+ cha.lastInteraction = Date.now()
if(typeof(index) === 'number'){
db.characters[index] = cha
setDatabase(db)
}
+ cha.chats = cha.chats.map((v) => {
+ v.fmIndex ??= cha.firstMsgIndex ?? -1
+ return v
+ })
return cha
}
@@ -731,4 +742,52 @@ export async function removeChar(index:number,name:string, type:'normal'|'perman
db.characters = chars
setDatabase(db)
selectedCharID.set(-1)
+}
+
+export async function addCharacter(arg:{
+ reseter?:()=>any,
+} = {}){
+ MobileGUIStack.set(100)
+ const reseter = arg.reseter ?? (() => {})
+ const r = await alertAddCharacter()
+ if(r === 'importFromRealm'){
+ selectedCharID.set(-1)
+ OpenRealmStore.set(true)
+ MobileGUIStack.set(0)
+ return
+ }
+ reseter();
+ switch(r){
+ case 'createfromScratch':
+ createNewCharacter()
+ break
+ case 'createGroup':
+ createNewGroup()
+ break
+ case 'importCharacter':
+ await importCharacter()
+ break
+ default:
+ MobileGUIStack.set(1)
+ return
+ }
+ let db = get(DataBase)
+ if(db.characters[db.characters.length-1]){
+ changeChar(db.characters.length-1)
+ }
+ MobileGUIStack.set(1)
+}
+
+export function changeChar(index: number, arg:{
+ reseter?:()=>any,
+} = {}) {
+ const reseter = arg.reseter ?? (() => {})
+ if(get(doingChat)){
+ return
+ }
+ reseter();
+ characterFormatUpdate(index, {
+ updateInteraction: true,
+ });
+ selectedCharID.set(index);
}
\ No newline at end of file
diff --git a/src/ts/drive/backuplocal.ts b/src/ts/drive/backuplocal.ts
index 6e96bba8..5921a6ac 100644
--- a/src/ts/drive/backuplocal.ts
+++ b/src/ts/drive/backuplocal.ts
@@ -1,11 +1,11 @@
-import { BaseDirectory, readBinaryFile, readDir, writeBinaryFile } from "@tauri-apps/api/fs";
+import { BaseDirectory, readFile, readDir, writeFile } from "@tauri-apps/plugin-fs";
import { alertError, alertNormal, alertStore, alertWait } from "../alert";
import { LocalWriter, forageStorage, isTauri } from "../storage/globalApi";
import { decodeRisuSave, encodeRisuSave } from "../storage/risuSave";
import { get } from "svelte/store";
import { DataBase } from "../storage/database";
-import { save } from "@tauri-apps/api/dialog";
-import { relaunch } from "@tauri-apps/api/process";
+import { save } from "@tauri-apps/plugin-dialog";
+import { relaunch } from "@tauri-apps/plugin-process";
import { sleep } from "../util";
import { hubURL } from "../characterCards";
@@ -41,7 +41,7 @@ export async function SaveLocalBackup(){
if(isTauri){
- const assets = await readDir('assets', {dir: BaseDirectory.AppData})
+ const assets = await readDir('assets', {baseDir: BaseDirectory.AppData})
let i = 0;
for(let asset of assets){
i += 1;
@@ -50,7 +50,7 @@ export async function SaveLocalBackup(){
if(!key || !key.endsWith('.png')){
continue
}
- await writer.writeBackup(key, await readBinaryFile(asset.path))
+ await writer.writeBackup(key, await readFile(asset.name, {baseDir: BaseDirectory.AppData}))
}
}
else{
@@ -63,7 +63,7 @@ export async function SaveLocalBackup(){
if(!key || !key.endsWith('.png')){
continue
}
- await writer.writeBackup(key, await forageStorage.getItem(key))
+ await writer.writeBackup(key, await forageStorage.getItem(key) as unknown as Uint8Array)
if(forageStorage.isAccount){
await sleep(1000)
}
@@ -115,7 +115,7 @@ export async function LoadLocalBackup(){
const dbData = await decodeRisuSave(db)
DataBase.set(dbData)
if(isTauri){
- await writeBinaryFile('database/database.bin', db, {dir: BaseDirectory.AppData})
+ await writeFile('database/database.bin', db, {baseDir: BaseDirectory.AppData})
relaunch()
alertStore.set({
type: "wait",
@@ -133,7 +133,7 @@ export async function LoadLocalBackup(){
continue
}
if(isTauri){
- await writeBinaryFile(`assets/` + name, data ,{dir: BaseDirectory.AppData})
+ await writeFile(`assets/` + name, data ,{baseDir: BaseDirectory.AppData})
}
else{
await forageStorage.setItem('assets/' + name, data)
diff --git a/src/ts/drive/drive.ts b/src/ts/drive/drive.ts
index 0aa4ee39..4abfa56a 100644
--- a/src/ts/drive/drive.ts
+++ b/src/ts/drive/drive.ts
@@ -1,10 +1,10 @@
import { get } from "svelte/store";
-import { alertError, alertErrorWait, alertInput, alertNormal, alertSelect, alertStore } from "../alert";
-import { DataBase, setDatabase, type Database } from "../storage/database";
-import { forageStorage, getUnpargeables, isNodeServer, isTauri, openURL } from "../storage/globalApi";
-import { BaseDirectory, exists, readBinaryFile, readDir, writeBinaryFile } from "@tauri-apps/api/fs";
+import { alertError, alertInput, alertNormal, alertSelect, alertStore } from "../alert";
+import { DataBase, type Database } from "../storage/database";
+import { forageStorage, getUnpargeables, isTauri, openURL } from "../storage/globalApi";
+import { BaseDirectory, exists, readFile, readDir, writeFile } from "@tauri-apps/plugin-fs";
import { language } from "../../lang";
-import { relaunch } from '@tauri-apps/api/process';
+import { relaunch } from '@tauri-apps/plugin-process';
import { isEqual } from "lodash";
import { sleep } from "../util";
import { hubURL } from "../characterCards";
@@ -112,89 +112,6 @@ let BackupDb:Database = null
export async function syncDrive() {
BackupDb = structuredClone(get(DataBase))
return
- while(true){
- const maindb = get(DataBase)
- if(maindb?.account?.data?.access_token && maindb?.account?.data?.refresh_token && maindb?.account?.data?.expires_in){
- if(maindb.account.data.expires_in < Date.now()){
- if(!maindb.account){
- alertError("Not logged in error")
- return
- }
- const s = await fetch(hubURL + '/drive/refresh', {
- method: "POST",
- body: JSON.stringify({
- token: maindb.account.token
- })
- })
- if(s.status !== 200){
- alertError(await s.text())
- return
- }
- maindb.account.data = await s.json()
- }
- const ACCESS_TOKEN = maindb.account.data.access_token
- const d = await loadDrive(ACCESS_TOKEN, 'sync')
- lastSaved = Math.floor(Date.now() / 1000)
- localStorage.setItem('risu_lastsaved', `${lastSaved}`)
- const hadNoSync = d === 'noSync'
- if((!isEqual(maindb, BackupDb)) || hadNoSync){
- BackupDb = structuredClone(maindb)
- const files:DriveFile[] = await getFilesInFolder(ACCESS_TOKEN)
- const fileNames = files.map((d) => {
- return d.name
- })
- if(isTauri){
- const assets = await readDir('assets', {dir: BaseDirectory.AppData})
- let i = 0;
- for(let asset of assets){
- i += 1;
- if(hadNoSync){
- alertStore.set({
- type: "wait",
- msg: `Uploading Sync Files... (${i} / ${assets.length})`
- })
- }
- const key = asset.name
- if(!key || !key.endsWith('.png')){
- continue
- }
- const formatedKey = formatKeys(key)
- if(!fileNames.includes(formatedKey)){
- await createFileInFolder(ACCESS_TOKEN, formatedKey, await readBinaryFile(asset.path))
- }
- }
- }
- else{
- const keys = await forageStorage.keys()
-
- for(let i=0;i
();
export const highlighter = (highlightDom:HTMLElement, id:number) => {
- if(highlightDom){
- if(!CSS.highlights){
- return
- }
-
- const walker = document.createTreeWalker(highlightDom, NodeFilter.SHOW_TEXT)
- const nodes:Node[] = []
- let currentNode = walker.nextNode();
- while (currentNode) {
- nodes.push(currentNode);
- currentNode = walker.nextNode();
- }
- const str = "{{char}}"
- if (!str) {
- return;
- }
-
- const ranges:HighlightInt[] = []
-
- nodes.map((el) => {
- const text = el.textContent.toLowerCase()
-
- const cbsParsed = simpleCBSHighlightParser(el,text)
- ranges.push(...cbsParsed)
-
- for(const syntax of highlighterSyntax){
- const regex = syntax.regex
- let match:RegExpExecArray | null;
- while ((match = regex.exec(text)) !== null) {
- const length = match[0].length;
- const index = match.index;
- const range = new Range();
- range.setStart(el, index);
- range.setEnd(el, index + length);
- ranges.push([range, syntax.type])
- }
+ try {
+
+ if(highlightDom){
+ if(!CSS.highlights){
+ return
}
- });
-
- highLights.set(id, ranges)
-
- runHighlight()
+
+ const walker = document.createTreeWalker(highlightDom, NodeFilter.SHOW_TEXT)
+ const nodes:Node[] = []
+ let currentNode = walker.nextNode();
+ while (currentNode) {
+ nodes.push(currentNode);
+ currentNode = walker.nextNode();
+ }
+ const str = "{{char}}"
+ if (!str) {
+ return;
+ }
+
+ const ranges:HighlightInt[] = []
+
+ nodes.map((el) => {
+ const text = el.textContent.toLowerCase()
+
+ const cbsParsed = simpleCBSHighlightParser(el,text)
+ ranges.push(...cbsParsed)
+
+ for(const syntax of highlighterSyntax){
+ const regex = syntax.regex
+ let match:RegExpExecArray | null;
+ while ((match = regex.exec(text)) !== null) {
+ const length = match[0].length;
+ const index = match.index;
+ const range = new Range();
+ range.setStart(el, index);
+ range.setEnd(el, index + length);
+ ranges.push([range, syntax.type])
+ }
+ }
+ });
+
+ highLights.set(id, ranges)
+
+ runHighlight()
+ }
+ } catch (error) {
+
}
}
@@ -80,13 +85,14 @@ export const removeHighlight = (id:number) => {
}
const normalCBS = [
- 'previous_char_chat', 'lastcharmessage', 'previous_user_chat', 'lastusermessage', 'char', 'bot',
- 'user', 'char_persona', 'description', 'char_desc', 'example_dialogue',
+ 'char', 'user', 'char_persona', 'description', 'char_desc', 'example_dialogue', 'previous_char_chat',
+ 'lastcharmessage', 'previous_user_chat', 'lastusermessage',
'example_message', 'persona', 'user_persona', 'lorebook', 'world_info', 'history', 'messages',
'chat_index', 'first_msg_index', 'blank', 'none', 'message_time', 'message_date', 'time',
'date', 'isotime', 'isodate', 'message_idle_duration', 'idle_duration', 'br', 'newline',
'model', 'axmodel', 'role', 'jbtoggled', 'random', 'maxcontext', 'lastmessage', 'lastmessageid',
- 'lastmessageindex', 'emotionlist', 'assetlist', 'prefill_supported', 'unixtime', '/', '/if', '/each', '/pure', '/if_pure', 'slot', 'module_enabled'
+ 'lastmessageindex', 'emotionlist', 'assetlist', 'prefill_supported', 'unixtime', 'slot', 'module_enabled',
+ 'is_first_message', '/', '/if', '/each', '/pure', '/if_pure', '/func', '/pure_display'
]
const normalCBSwithParams = [
@@ -97,15 +103,19 @@ const normalCBSwithParams = [
'arraypop', 'array_pop', 'arraypush', 'array_push', 'arraysplice', 'array_splice',
'makearray', 'array', 'a', 'make_array', 'history', 'messages', 'range', 'date', 'time', 'datetimeformat', 'date_time_format',
'random', 'pick', 'roll', 'datetimeformat', 'hidden_key', 'reverse', 'getglobalvar', 'position', 'slot', 'rollp',
- 'and', 'or', 'not', 'message_time_array', 'filter', 'greater', 'less', 'greater_equal', 'less_equal'
+ 'and', 'or', 'not', 'message_time_array', 'filter', 'greater', 'less', 'greater_equal', 'less_equal', 'arg'
]
const displayRelatedCBS = [
- 'raw', 'img', 'video', 'audio', 'bg', 'emotion', 'asset', 'video-img', 'comment'
+ 'raw', 'img', 'video', 'audio', 'bg', 'emotion', 'asset', 'video-img', 'comment', 'image'
];
+const nestedCBS = [
+ '#if', '#if_pure ', '#pure ', '#each ', '#func', '#pure_display'
+]
+
const specialCBS = [
- '#if', '#if_pure ', '#pure ', '#each ', 'random:', 'pick:', 'roll:', 'datetimeformat:', '? ', 'hidden_key: ', 'reverse: ',
+ 'random:', 'pick:', 'roll:', 'datetimeformat:', '? ', 'hidden_key: ', 'reverse: ', ...nestedCBS
]
const deprecatedCBS = [
@@ -125,6 +135,11 @@ const decorators = [
const deprecatedDecorators = [
'end', 'assistant', 'user', 'system'
]
+
+export const AllCBS = [...normalCBS, ...(normalCBSwithParams.concat(displayRelatedCBS).map((v) => {
+ return v + ':'
+})), ...nestedCBS]
+
const highlighterSyntax = [
{
regex: /<(char|user|bot)>/gi,
diff --git a/src/ts/hotkey.ts b/src/ts/hotkey.ts
index c58b9086..a39f8de3 100644
--- a/src/ts/hotkey.ts
+++ b/src/ts/hotkey.ts
@@ -1,7 +1,9 @@
import { get } from "svelte/store"
-import { alertToast, doingAlert } from "./alert"
+import { alertSelect, alertToast, doingAlert } from "./alert"
import { DataBase, changeToPreset as changeToPreset2 } from "./storage/database"
-import { selectedCharID, settingsOpen } from "./stores"
+import { MobileGUIStack, MobileSideBar, openPersonaList, openPresetList, SafeModeStore, selectedCharID, settingsOpen } from "./stores"
+import { language } from "src/lang"
+import { updateTextThemeAndCSS } from "./gui/colorscheme"
export function initHotkey(){
document.addEventListener('keydown', (ev) => {
@@ -73,6 +75,25 @@ export function initHotkey(){
ev.stopPropagation()
break
}
+ case 'p':{
+ openPresetList.set(!get(openPresetList))
+ ev.preventDefault()
+ ev.stopPropagation()
+ break
+ }
+ case 'e':{
+ openPersonaList.set(!get(openPersonaList))
+ ev.preventDefault()
+ ev.stopPropagation()
+ break
+ }
+ case '.':{
+ SafeModeStore.set(!get(SafeModeStore))
+ updateTextThemeAndCSS()
+ ev.preventDefault()
+ ev.stopPropagation()
+ break
+ }
}
}
if(ev.key === 'Escape'){
@@ -85,6 +106,93 @@ export function initHotkey(){
ev.preventDefault()
}
})
+
+
+ let touchs = 0
+ let touchStartTime = 0
+ //check for triple touch
+ document.addEventListener('touchstart', async (ev) => {
+ touchs++
+ if(touchs > 2){
+ if(Date.now() - touchStartTime > 300){
+ return
+ }
+ touchs = 0
+ if(doingAlert()){
+ return
+ }
+ const selStr = await alertSelect([
+ language.presets,
+ language.persona,
+ language.cancel
+ ])
+ const sel = parseInt(selStr)
+ if(sel === 0){
+ openPresetList.set(!get(openPresetList))
+ }
+ if(sel === 1){
+ openPersonaList.set(!get(openPersonaList))
+ }
+ }
+ if(touchs === 1){
+ touchStartTime = Date.now()
+ }
+ })
+ document.addEventListener('touchend', (ev) => {
+ touchs = 0
+ })
+}
+
+export function initMobileGesture(){
+
+ let pressingPointers = new Map()
+
+ document.addEventListener('touchstart', (ev) => {
+ for(const touch of ev.changedTouches){
+ const ele = touch.target as HTMLElement
+ if(ele.tagName === 'BUTTON' || ele.tagName === 'INPUT' || ele.tagName === 'SELECT' || ele.tagName === 'TEXTAREA'){
+ return
+ }
+ pressingPointers.set(touch.identifier, {x: touch.clientX, y: touch.clientY})
+ }
+ }, {
+ passive: true
+ })
+ document.addEventListener('touchend', (ev) => {
+ for(const touch of ev.changedTouches){
+ const d = pressingPointers.get(touch.identifier)
+ const moveX = touch.clientX - d.x
+ const moveY = touch.clientY - d.y
+ pressingPointers.delete(touch.identifier)
+
+ if(moveX > 50 && Math.abs(moveY) < Math.abs(moveX)){
+ if(get(selectedCharID) === -1){
+ if(get(MobileGUIStack) > 0){
+ MobileGUIStack.update(v => v - 1)
+ }
+ }
+ else{
+ if(get(MobileSideBar) > 0){
+ MobileSideBar.update(v => v - 1)
+ }
+ }
+ }
+ else if(moveX < -50 && Math.abs(moveY) < Math.abs(moveX)){
+ if(get(selectedCharID) === -1){
+ if(get(MobileGUIStack) < 2){
+ MobileGUIStack.update(v => v + 1)
+ }
+ }
+ else{
+ if(get(MobileSideBar) < 3){
+ MobileSideBar.update(v => v + 1)
+ }
+ }
+ }
+ }
+ }, {
+ passive: true
+ })
}
function changeToPreset(num:number){
diff --git a/src/ts/model/names.ts b/src/ts/model/names.ts
index ffc08d98..c0d1f72c 100644
--- a/src/ts/model/names.ts
+++ b/src/ts/model/names.ts
@@ -105,10 +105,18 @@ export function getModelName(name:string){
return 'GPT-4o ChatGPT'
case 'gpt4om':
return 'GPT-4o Mini'
+ case 'gpt4o1-preview':
+ return 'o1 Preview'
+ case 'gpt4o1-mini':
+ return 'o1 Mini'
case 'gpt4om-2024-07-18':
return 'GPT-4o Mini (2024-07-18)'
case 'gemini-1.5-pro-latest':
return 'Gemini 1.5 Pro'
+ case 'gemini-1.5-pro-exp-0801':
+ return 'Gemini 1.5 Pro Exp (0801)'
+ case 'gemini-1.5-pro-exp-0827':
+ return 'Gemini 1.5 Pro Exp (0827)'
case 'gemini-1.5-flash':
return 'Gemini 1.5 Flash'
case 'ollama-hosted':
diff --git a/src/ts/parser.ts b/src/ts/parser.ts
index 3d4ff799..d2af1c79 100644
--- a/src/ts/parser.ts
+++ b/src/ts/parser.ts
@@ -4,17 +4,13 @@ import { DataBase, setDatabase, type Database, type Message, type character, typ
import { getFileSrc } from './storage/globalApi';
import { processScriptFull } from './process/scripts';
import { get } from 'svelte/store';
-import css from '@adobe/css-tools'
-import { CurrentCharacter, CurrentChat, SizeStore, selectedCharID } from './stores';
+import css, { type CssAtRuleAST } from '@adobe/css-tools'
+import { CurrentCharacter, SizeStore, selectedCharID } from './stores';
import { calcString } from './process/infunctions';
import { findCharacterbyId, getPersonaPrompt, getUserIcon, getUserName, parseKeyValue, sfc32, sleep, uuidtoNumber } from './util';
-import { getInlayImage, writeInlayImage } from './process/files/image';
-import { getModuleLorebooks } from './process/modules';
-import { HypaProcesser } from './process/memory/hypamemory';
-import { generateAIImage } from './process/stableDiff';
-import { requestChatData } from './process/request';
+import { getInlayImage } from './process/files/image';
+import { getModuleAssets, getModuleLorebooks } from './process/modules';
import type { OpenAIChat } from './process';
-import { alertInput, alertNormal } from './alert';
import hljs from 'highlight.js/lib/core'
import 'highlight.js/styles/atom-one-dark.min.css'
@@ -79,11 +75,24 @@ DOMPurify.addHook("uponSanitizeAttribute", (node, data) => {
function renderMarkdown(md:markdownit, data:string){
- return md.render(data.replace(/“|”/g, '"').replace(/‘|’/g, "'"))
- .replace(/\uE9b0/gu, '“')
- .replace(/\uE9b1/gu, '”')
- .replace(/\uE9b2/gu, '‘')
- .replace(/\uE9b3/gu, '’')
+ const db = get(DataBase)
+ let quotes = ['“', '”', '‘', '’']
+ if(db?.customQuotes){
+ quotes = db.customQuotesData ?? quotes
+ }
+
+ let text = md.render(data.replace(/“|”/g, '"').replace(/‘|’/g, "'"))
+
+ if(db?.unformatQuotes){
+ text = text.replace(/\uE9b0/gu, quotes[0]).replace(/\uE9b1/gu, quotes[1])
+ text = text.replace(/\uE9b2/gu, quotes[2]).replace(/\uE9b3/gu, quotes[3])
+ }
+ else{
+ text = text.replace(/\uE9b0/gu, '' + quotes[0]).replace(/\uE9b1/gu, quotes[1] + '')
+ text = text.replace(/\uE9b2/gu, '' + quotes[2]).replace(/\uE9b3/gu, quotes[3] + '')
+ }
+
+ return text
}
async function renderHighlightableMarkdown(data:string) {
@@ -242,7 +251,7 @@ async function renderHighlightableMarkdown(data:string) {
}
-export const assetRegex = /{{(raw|img|video|audio|bg|emotion|asset|video-img|source)::(.+?)}}/g
+export const assetRegex = /{{(raw|path|img|image|video|audio|bg|emotion|asset|video-img|source)::(.+?)}}/g
async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|character, mode:'normal'|'back', mode2:'unset'|'pre'|'post' = 'unset'){
const db = get(DataBase)
@@ -273,6 +282,16 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
}
}
}
+ const moduleAssets = getModuleAssets()
+ if(moduleAssets.length > 0){
+ for(const asset of moduleAssets){
+ const assetPath = await getFileSrc(asset[1])
+ assetPaths[asset[0].toLocaleLowerCase()] = {
+ path: assetPath,
+ ext: asset[2]
+ }
+ }
+ }
const videoExtention = ['mp4', 'webm', 'avi', 'm4p', 'm4v']
let needsSourceAccess = false
data = data.replaceAll(assetRegex, (full:string, type:string, name:string) => {
@@ -301,15 +320,18 @@ async function parseAdditionalAssets(data:string, char:simpleCharacterArgument|c
}
switch(type){
case 'raw':
+ case 'path':
return path.path
case 'img':
return `
`
+ case 'image':
+ return `