-
-
-
-
+{#if !globalMode}
+
+
+
+
+
+{/if}
{#if submenu !== 2}
{submenu === 0 ? $DataBase.characters[$selectedCharID].type === 'group' ? language.groupLoreInfo : language.globalLoreInfo : language.localLoreInfo}
diff --git a/src/lib/SideBars/RegexData.svelte b/src/lib/SideBars/RegexData.svelte
index de56752a..ab33ceff 100644
--- a/src/lib/SideBars/RegexData.svelte
+++ b/src/lib/SideBars/RegexData.svelte
@@ -34,6 +34,7 @@
+
IN:
diff --git a/src/lib/SideBars/Settings.svelte b/src/lib/SideBars/Settings.svelte
deleted file mode 100644
index a1a4dab2..00000000
--- a/src/lib/SideBars/Settings.svelte
+++ /dev/null
@@ -1,595 +0,0 @@
-
-
- 0){
+ for(let i=0;i {
+ if (data.tagName === "iframe") {
+ const src = node.getAttribute("src") || "";
+ if (!src.startsWith("https://www.youtube.com/embed/")) {
+ return node.parentNode.removeChild(node);
+ }
+ }
+});
+
+export async function ParseMarkdown(data:string, char:(character | groupChat) = null) {
+ if(char && char.type !== 'group'){
+ if(char.customscript){
+ data = processScript(char, data, 'editdisplay')
+ }
+ if(char.additionalAssets){
+ for(const asset of char.additionalAssets){
+ const assetPath = await getFileSrc(asset[1])
+ data = data.replaceAll(`{{raw::${asset[0]}}}`, assetPath).replaceAll(`{{img::${asset[0]}}}`,`
`)
+ }
+ }
+ }
return DOMPurify.sanitize(convertor.makeHtml(data), {
- FORBID_TAGS: []
+ ADD_TAGS: ["iframe"],
+ ADD_ATTR: ["allow", "allowfullscreen", "frameborder", "scrolling"],
})
}
diff --git a/src/ts/process/scripts.ts b/src/ts/process/scripts.ts
index 24f9c4b7..e9073206 100644
--- a/src/ts/process/scripts.ts
+++ b/src/ts/process/scripts.ts
@@ -4,7 +4,7 @@ import type { character } from "../database";
const dreg = /{{data}}/g
-type ScriptMode = 'editinput'|'editoutput'|'editprocess'
+type ScriptMode = 'editinput'|'editoutput'|'editprocess'|'editdisplay'
export function processScript(char:character, data:string, mode:ScriptMode){
return processScriptFull(char, data, mode).data
diff --git a/src/ts/translator/translator.ts b/src/ts/translator/translator.ts
index 43f1c84d..cb682cc0 100644
--- a/src/ts/translator/translator.ts
+++ b/src/ts/translator/translator.ts
@@ -1,7 +1,4 @@
-import { Body,fetch as TauriFetch,ResponseType } from "@tauri-apps/api/http"
-import { isTauri } from "../globalApi"
import { translatorPlugin } from "../process/plugins"
-import { sleep } from "../util"
let cache={
origin: [''],
diff --git a/version.json b/version.json
index 25e6454d..8dab4229 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version":"1.11.0"}
\ No newline at end of file
+{"version":"1.12.0"}
\ No newline at end of file
-
-
-
-
-
-
-
-
-{#if subMenu === -1}
- {language.userSetting}
- {language.userIcon} - - {language.username} - - -{:else if subMenu === 0 && subSubMenu === 0} -{language.botSettings}
-
-
-
-
- {language.model}
-
- OpenAI {language.streaming}
-
- {/if}
- {#if $DataBase.aiModel === 'custom'}
- {language.plugin}
-
- {/if}
- {#if $DataBase.aiModel === 'textgen_webui' || $DataBase.subModel === 'textgen_webui'}
- TextGen {language.providerURL}
-
-
-
-
-
-
-
-
-{:else if subMenu === 0 && subSubMenu === 1}
- {language.advancedSettings}
- {language.formatingOrder}| Bias | -{language.value} | - {
- let bia = $DataBase.bias
- bia.push(['', 0])
- $DataBase.bias = bia
- }}> |
-
|---|---|---|
| - - | -- - | - -
-
- {language.promptPreprocess}
-
- {language.botSettings}
-
-
-
-
- {language.imageGeneration}
-
- {language.provider}
-
- Enable Hires
-
- {#if $DataBase.sdConfig.enable_hr === true}
- denoising_strength
-
- hr_scale
-
- Upscaler
-
- {/if}
- {/if}
-
-
- TTS
- ElevenLabs API key
-
-
-
-{:else if subMenu == 3}
- {language.display}
- {language.UiLanguage} - - - {language.theme} - - - - {#if $DataBase.theme === "waifu"} - {language.waifuWidth} - - {($DataBase.waifuWidth)}% - - {language.waifuWidth2} - - {($DataBase.waifuWidth2)}% - {/if} - - {language.textColor} - - - {#if $DataBase.textTheme === "custom"} -
-
- Normal Text
-
-
-
- Italic Text
-
-
-
- Bold Text
-
-
-
- Italic Bold Text
-
- {/if}
-
-
- {language.translator}
-
- {language.UISize}
-
- {($DataBase.zoomsize)}%
-
- {language.iconSize}
-
- {($DataBase.iconsize)}%
-
-
-
-
-
- {language.fullscreen}
-
-
-
-
- {language.showMemoryLimit}
-
-
-
- {
- if(check){
- $DataBase.customBackground = '-'
- const d = await selectSingleFile(['png', 'webp', 'gif'])
- if(!d){
- $DataBase.customBackground = ''
- return
- }
- const img = await saveImage(d.data)
- $DataBase.customBackground = img
- }
- else{
- $DataBase.customBackground = ''
- }
- }}>
- {language.useCustomBackground}
-
-
-
-
- {language.playMessage}
-
-
-
- {language.SwipeRegenerate}
-
-
-
-
- {language.roundIcons}
-
-
-
-
- {language.instantRemove}
-
-
-{:else if subMenu === 2}
- {language.plugin}
- {language.pluginWarn} - - -
- {#if $DataBase.plugins.length === 0}
- No Plugins
- {:else}
- {#each $DataBase.plugins as plugin, i}
- {#if i !== 0}
-
- {/if}
-
-
- {plugin.displayName ?? plugin.name}
-
-
- {#if Object.keys(plugin.arguments).length > 0}
-
- {#each Object.keys(plugin.arguments) as arg}
- {arg}
- {#if Array.isArray(plugin.arguments[arg])}
-
- {:else if plugin.arguments[arg] === 'string'}
-
- {:else if plugin.arguments[arg] === 'int'}
-
- {/if}
- {/each}
-
- {/if}
- {/each}
- {/if}
-
-
-
-{:else if subMenu === 1}
- {language.advancedSettings}
- {language.advancedSettingsWarn} - {language.loreBookDepth} - - {language.loreBookToken} - - - {language.additionalPrompt} - - - {language.descriptionPrefix} - - - {language.emotionPrompt} - - - {language.SuperMemory} Prompt
-
- {language.sayNothing}
-
-
-
- {language.showUnrecommended}
-
-
-
- {language.useExperimental}
-
-
-
-{:else if subMenu === 4}
- {language.files}
- - - - - -{/if} - - \ No newline at end of file diff --git a/src/lib/SideBars/Sidebar.svelte b/src/lib/SideBars/Sidebar.svelte index d5c85b1f..af5bed90 100644 --- a/src/lib/SideBars/Sidebar.svelte +++ b/src/lib/SideBars/Sidebar.svelte @@ -29,10 +29,9 @@ getCharImage, } from "../../ts/characters"; import { importCharacter } from "src/ts/characterCards"; - import SettingsDom from "./Settings.svelte"; import CharConfig from "./CharConfig.svelte"; import { language } from "../../lang"; - import Botpreset from "../Others/botpreset.svelte"; + import Botpreset from "../Setting/botpreset.svelte"; import { onDestroy } from "svelte"; import { isEqual } from "lodash"; import SidebarAvatar from "./SidebarAvatar.svelte"; @@ -226,7 +225,10 @@ {#if sideBarMode === 0} {#if $selectedCharID < 0 || $settingsOpen} -
+
{:else}