1.105.0 (#437)

# PR Checklist
- [ ] Did you check if it works normally in all models? *ignore this
when it dosen't uses models*
- [ ] Did you check if it works normally in all of web, local and node
hosted versions? if it dosen't, did you blocked it in those versions?
- [ ] Did you added a type def?

# Description

Author: kwaroran

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "RisuAI",
-    "version": "1.104.0"
+    "version": "1.105.0"
   },
   "tauri": {
     "allowlist": {

src/App.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
     import Sidebar from './lib/SideBars/Sidebar.svelte';
-    import {ArrowRight} from 'lucide-svelte'
-    import { DynamicGUI, settingsOpen, sideBarStore } from './ts/stores';
+    import { DynamicGUI, settingsOpen, sideBarStore, ShowRealmFrameStore } from './ts/stores';
     import { DataBase, loadedStore } from './ts/storage/database';
     import ChatScreen from './lib/ChatScreens/ChatScreen.svelte';
     import AlertComp from './lib/Others/AlertComp.svelte';
@@ -11,6 +10,7 @@
     import WelcomeRisu from './lib/Others/WelcomeRisu.svelte';
     import Settings from './lib/Setting/Settings.svelte';
     import { showRealmInfoStore } from './ts/characterCards';
+    import RealmFrame from './lib/UI/Realm/RealmFrame.svelte';
 
     let didFirstSetup: boolean  = false
     let gridOpen = false
@@ -60,4 +60,7 @@
     {#if $showRealmInfoStore}
         <RealmPopUp bind:openedData={$showRealmInfoStore} />
     {/if}
+    {#if $ShowRealmFrameStore}
+        <RealmFrame />
+    {/if}
 </main>

src/etc/patchNote.ts

@@ -1,15 +1,14 @@
 export const patchNote = {
-    version: "1.104",
+    version: "1.105",
     content: 
 `
-# Update 1.104
-- Added experimental Hypamemory V2
-- Added catalog list menu
-- Added catalog trash menu
-- Added trash
- - Now if you delete a character, it will be moved to the trash instead of being deleted permanently
- - You can restore the character from the trash
- - Characters in the trash will be deleted permanently after 3 days
+# Update 1.105
+- Reworked RisuRealm share screen
+ - Now it uses RisuRealm iframe instead of GUI provided by app
+- Added RisuRealm preset sharing support
+- Added new preset sharing screen
+- Added {{first_msg_index}} CBS #436
+- Removed RisuRCC dude to low usage
 `
 }
 

src/lang/en.ts

@@ -529,6 +529,7 @@ export const languageEnglish = {
     memoryLimitThickness: "Memory Limit Thickness",
     inputCardPassword: "Input Card Password",
     ccv2Desc: 'Character Card V2 is is a format widely used in chatbot programs.',
+    realmDesc: 'RisuRealm is a content sharing platform for RisuAI. you can share your character to other users.',
     rccDesc: 'Risu Refined Character Card is a format with additional features like password, integrity check and etc.',
     password: "Password",
     license: "License",
@@ -599,4 +600,7 @@ export const languageEnglish = {
     list: "List",
     trash: "Trash",
     trashDesc: "Deleted characters are moved to trash. you can restore or delete them permanently. deleted characters are automatically purged after 3 days.",
+    shareExport: "Share/Export",
+    risupresetDesc: "Risupreset format is a format specifically designed for RisuAI presets.",
+    jsonDesc: "JSON format is a format that is easy to read and write for both humans and machines.",
 }

src/lib/Others/AlertComp.svelte

@@ -24,15 +24,19 @@
     let cardExportPassword = ''
     let cardLicense = ''
     let generationInfoMenuIndex = 0
-    $: (() => {
+    $: {
         if(btn){
             btn.focus()
         }
         if($alertStore.type !== 'input'){
             input = ''
         }
-        
-    })()
+        if($alertStore.type !== 'cardexport'){
+            cardExportType = ''
+            cardExportPassword = ''
+            cardLicense = ''
+        }
+    }
 
     const beautifyJSON = (data:string) =>{
         try {
@@ -372,7 +376,7 @@
         <div class="bg-darkbg rounded-md p-4 max-w-full flex flex-col w-2xl" on:click|stopPropagation>
             <h1 class="font-bold text-2xl w-full">
                 <span>
-                    Export Character
+                    {language.shareExport}
                 </span>
                 <button class="float-right text-textcolor2 hover:text-green-500" on:click={() => {
                     alertStore.set({
@@ -387,29 +391,27 @@
                     <XIcon />
                 </button>
             </h1>
-            <span class="text-textcolor mt-4">Type</span>
+            <span class="text-textcolor mt-4">{language.type}</span>
             {#if cardExportType === ''}
-                <span class="text-textcolor2 text-sm">{language.ccv2Desc}</span>
+                {#if $alertStore.submsg !== 'preset'}
+                    <span class="text-textcolor2 text-sm">{language.risupresetDesc}</span>
+                {:else}
+                    <span class="text-textcolor2 text-sm">{language.ccv2Desc}</span>
+                {/if}
+            {:else if cardExportType === 'json'}
+                <span class="text-textcolor2 text-sm">{language.jsonDesc}</span>
             {:else}
-                <span class="text-textcolor2 text-sm">{language.rccDesc}</span>
+                <span class="text-textcolor2 text-sm">{language.realmDesc}</span>
             {/if}
             <div class="flex items-center flex-wrap mt-2">
-                <button class="bg-bgcolor px-2 py-4 rounded-lg flex-1" class:ring-1={cardExportType === ''} on:click={() => {cardExportType = ''}}>Character Card V2</button>
-                <button class="bg-bgcolor px-2 py-4 rounded-lg ml-2 flex-1" class:ring-1={cardExportType === 'rcc'} on:click={() => {cardExportType = 'rcc'}}>Risu RCC</button>
+                {#if $alertStore.submsg === 'preset'}
+                    <button class="bg-bgcolor px-2 py-4 rounded-lg flex-1" class:ring-1={cardExportType === ''} on:click={() => {cardExportType = ''}}>Risupreset</button>
+                    <button class="bg-bgcolor px-2 py-4 rounded-lg ml-2 flex-1" class:ring-1={cardExportType === 'json'} on:click={() => {cardExportType = 'json'}}>JSON</button>
+                    <button class="bg-bgcolor px-2 py-4 rounded-lg ml-2 flex-1" class:ring-1={cardExportType === 'realm'} on:click={() => {cardExportType = 'realm'}}>RisuRealm</button>
+                {:else}
+                    <button class="bg-bgcolor px-2 py-4 rounded-lg flex-1" class:ring-1={cardExportType === ''} on:click={() => {cardExportType = ''}}>Character Card V2</button>
+                {/if}
             </div>
-            {#if cardExportType === 'rcc'}
-                <span class="text-textcolor mt-4">{language.password}</span>
-                <span class="text-textcolor2 text-sm">{language.passwordDesc}</span>
-                <TextInput placeholder="" bind:value={cardExportPassword} />
-                <span class="text-textcolor mt-4">{language.license}</span>
-                <span class="text-textcolor2 text-sm">{language.licenseDesc}</span>
-                <SelectInput bind:value={cardLicense}>
-                    <OptionInput value="">None</OptionInput>
-                    {#each Object.keys(CCLicenseData) as ccl}
-                        <OptionInput value={ccl}>{CCLicenseData[ccl][2]} ({CCLicenseData[ccl][1]})</OptionInput>
-                    {/each}
-                </SelectInput>
-            {/if}
             <Button className="mt-4" on:click={() => {
                 alertStore.set({
                     type: 'none',
@@ -419,7 +421,7 @@
                         license: cardLicense
                     })
                 })
-            }}>{language.export}</Button>
+            }}>{cardExportType === 'realm' ? language.shareCloud : language.export}</Button>
         </div>
     </div>
 

src/lib/Setting/botpreset.svelte

@@ -1,10 +1,11 @@
-<script>
-    import { alertConfirm, alertError } from "../../ts/alert";
+<script lang="ts">
+    import { alertCardExport, alertConfirm, alertError } from "../../ts/alert";
     import { language } from "../../lang";
-    import { DataBase, changeToPreset, copyPreset, downloadPreset, importPreset, presetTemplate } from "../../ts/storage/database";
-    import { CopyIcon, DownloadIcon, EditIcon, FolderUpIcon, PlusIcon, TrashIcon, XIcon } from "lucide-svelte";
+    import { DataBase, changeToPreset, copyPreset, downloadPreset, importPreset } from "../../ts/storage/database";
+    import { CopyIcon, Share2Icon, PencilIcon, FolderUpIcon, PlusIcon, TrashIcon, XIcon } from "lucide-svelte";
     import TextInput from "../UI/GUI/TextInput.svelte";
     import { prebuiltPresets } from "src/ts/process/templates/templates";
+    import { ShowRealmFrameStore } from "src/ts/stores";
 
     let editMode = false
     export let close = () => {}
@@ -43,12 +44,26 @@
                     }}>
                         <CopyIcon size={18}/>
                     </button>
-                    <button class="text-textcolor2 hover:text-green-500 cursor-pointer mr-2" on:click={(e) => {
+                    <button class="text-textcolor2 hover:text-green-500 cursor-pointer mr-2" on:click={async (e) => {
                         e.stopPropagation()
-                        downloadPreset(i)
+                        const data = await alertCardExport('preset')
+                        console.log(data.type)
+                        if(data.type === ''){
+                            downloadPreset(i, 'risupreset')
+                        }
+                        if(data.type === 'json'){
+                            downloadPreset(i, 'json')
+                        }
+                        if(data.type === 'realm'){
+                            if(!$DataBase.account){
+                                alertError(language.notLoggedIn)
+                                return
+                            }
+                            $ShowRealmFrameStore = `preset:${i}`
+                        }
                     }}>
 
-                        <DownloadIcon size={18} />
+                        <Share2Icon size={18} />
                     </button>
                     <button class="text-textcolor2 hover:text-green-500 cursor-pointer" on:click={async (e) => {
                         e.stopPropagation()
@@ -89,7 +104,7 @@
             <button class="text-textcolor2 hover:text-green-500 cursor-pointer" on:click={() => {
                 editMode = !editMode
             }}>
-                <EditIcon size={18}/>
+                <PencilIcon size={18}/>
             </button>
         </div>
         <span class="text-textcolor2 text-sm">{language.quickPreset}</span>

src/lib/SideBars/CharConfig.svelte

@@ -2,7 +2,7 @@
     import { language } from "../../lang";
     import { tokenizeAccurate } from "../../ts/tokenizer";
     import { DataBase, saveImage as saveAsset, type Database, type character, type groupChat } from "../../ts/storage/database";
-    import { selectedCharID } from "../../ts/stores";
+    import { ShowRealmFrameStore, selectedCharID } from "../../ts/stores";
     import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, User, CurlyBraces, Volume2Icon } from 'lucide-svelte'
     import Check from "../UI/GUI/CheckInput.svelte";
     import { addCharEmotion, addingEmotion, getCharImage, rmCharEmotion, selectCharImg, makeGroupImage, removeChar } from "../../ts/characters";
@@ -17,7 +17,6 @@
     import { getElevenTTSVoices, getWebSpeechTTSVoices, getVOICEVOXVoices, oaiVoices, getNovelAIVoices, FixNAITTS } from "src/ts/process/tts";
     import { checkCharOrder, getFileSrc } from "src/ts/storage/globalApi";
     import { addGroupChar, rmCharFromGroup } from "src/ts/process/group";
-    import RealmUpload from "../UI/Realm/RealmUpload.svelte";
     import TextInput from "../UI/GUI/TextInput.svelte";
     import NumberInput from "../UI/GUI/NumberInput.svelte";
     import TextAreaInput from "../UI/GUI/TextAreaInput.svelte";
@@ -30,11 +29,9 @@
     import { updateInlayScreen } from "src/ts/process/inlayScreen";
     import { registerOnnxModel } from "src/ts/process/transformers";
     import MultiLangInput from "../UI/GUI/MultiLangInput.svelte";
-  import { shareRealmCard } from "src/ts/realm";
     
 
     let subMenu = 0
-    let openHubUpload = false
     let emos:[string, string][] = []
     let tokens = {
         desc: 0,
@@ -833,7 +830,7 @@
             || $DataBase.tpo
         }
             <Button size="lg" on:click={async () => {
-                exportChar($selectedCharID)
+                const res = await exportChar($selectedCharID)
             }} className="mt-2">{language.exportCharacter}</Button>
         {/if}
 
@@ -846,8 +843,7 @@
                     return
                 }
                 if(await alertTOS()){
-                    // openHubUpload = true
-                    shareRealmCard()
+                    $ShowRealmFrameStore = 'character'
                 }
             }} className="mt-2">
                 {#if currentChar.data.realmId}
@@ -857,10 +853,6 @@
                 {/if}
             </Button>
         {/if}
-
-        {#if openHubUpload}
-            <RealmUpload bind:char={currentChar.data} close={() => {openHubUpload=false}}/>
-        {/if}
     {:else}
         {#if currentChar.data.chats[currentChar.data.chatPage].supaMemoryData && currentChar.data.chats[currentChar.data.chatPage].supaMemoryData.length > 4 || currentChar.data.supaMemory}
             <span class="text-textcolor">{language.SuperMemory}</span>

src/lib/UI/Realm/RealmFrame.svelte

@@ -0,0 +1,114 @@
+<script lang="ts">
+    import { alertMd } from "src/ts/alert";
+    import { shareRealmCardData } from "src/ts/realm";
+    import { DataBase, downloadPreset } from "src/ts/storage/database";
+    import { CurrentCharacter, ShowRealmFrameStore } from "src/ts/stores";
+    import { sleep } from "src/ts/util";
+    import { onDestroy, onMount } from "svelte";
+
+    const close =  () => {
+        $ShowRealmFrameStore = ''
+    }
+    let iframe: HTMLIFrameElement = null
+    const tk = $DataBase?.account?.token;
+    const id = $DataBase?.account?.id
+    let loadingStage = 0
+    let pongGot = false
+
+    const pmfunc = (e:MessageEvent) => {
+        if(e.data.type === 'filedata' && e.data.success){
+            loadingStage = 2
+        }
+        if(e.data.type === 'pong'){
+            pongGot = true
+        }
+        if(e.data.type === 'close'){
+            close()
+        }
+        if(e.data.type === 'success'){
+            alertMd(`## Upload Success\n\nYour character has been uploaded to Realm successfully.\n\n${"```\nhttps://realm.risuai.net/character/" +  e.data.id + "\n```"}`)
+            if($ShowRealmFrameStore.startsWith('preset')){
+                //TODO, add preset edit
+            }
+            else if($CurrentCharacter.type === 'character'){
+                loadingStage = 0
+                $CurrentCharacter.realmId = e.data.id
+            }
+            close()
+        }
+    }
+
+    const waitPing = async () => {
+        if(iframe){
+            while(!pongGot){
+                iframe.contentWindow.postMessage({
+                    type: 'ping'
+                }, '*')
+                await sleep(300)
+            }
+        }
+    }
+
+    onMount(async () => {
+        window.addEventListener('message', pmfunc)
+
+        let data:{
+            data: ArrayBuffer,
+            name: ArrayBuffer
+        }
+        
+        if($ShowRealmFrameStore.startsWith('preset')){
+            const predata = await downloadPreset(Number($ShowRealmFrameStore.split(':')[1]), 'return')
+            const encodedPredata = predata.buf
+            const encodedPredataName = new TextEncoder().encode(predata.data.name + '.risupreset')
+            data = {
+                data: encodedPredata.buffer,
+                name: encodedPredataName.buffer
+            }
+        }
+        else{
+            data = await shareRealmCardData()
+        }
+
+        if(iframe){
+            await waitPing()
+            loadingStage = 1
+            iframe.contentWindow.postMessage({
+                type: 'filedata',
+                buf: [data.data, data.name]
+            }, '*', [data.data, data.name])
+        }
+    })
+
+    const getUrl = () => {
+        let url = `https://realm.risuai.net/upload?token=${tk}&token_id=${id}`
+        if($ShowRealmFrameStore.startsWith('preset')){
+            //TODO, add preset edit
+        }
+        else if($CurrentCharacter.type === 'character' && $CurrentCharacter.realmId){
+            url += `&edit=${$CurrentCharacter.realmId}&edit-type=normal`
+        }
+        url += '#noLayout'
+        return url
+    }
+
+    onDestroy(() => {
+        window.removeEventListener('message', pmfunc)
+    })
+</script>
+
+<div class="top-0 left-0 z-50 fixed w-full h-full flex flex-col justify-center items-center text-textcolor bg-white">
+    <div class="bg-darkbg border-b border-b-darkborderc w-full flex p-2">
+        <h1 class="text-2xl font-bold max-w-full overflow-hidden whitespace-nowrap text-ellipsis">Upload to Realm</h1>
+        <button class="text-textcolor text-lg hover:text-red-500 ml-auto" on:click={close}>&times;</button>
+    </div>
+    {#if loadingStage < 1}
+    <div class="w-full flex justify-center items-center p-4 flex-1">
+        <div class="loadmove"/>
+    </div>
+    {/if}
+    <iframe bind:this={iframe}
+        src={getUrl()}
+        title="upload" class="w-full flex-1" class:hidden={loadingStage < 1}
+    />
+</div>