From 1c30c4ac98c0f2a5ef4cc1cb6a6f597075b5e055 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 21:29:48 +0900
Subject: [PATCH 01/11] chore: Move comparison operators

---
 src/ts/gui/highlight.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ts/gui/highlight.ts b/src/ts/gui/highlight.ts
index fe75301c..63ae71cd 100644
--- a/src/ts/gui/highlight.ts
+++ b/src/ts/gui/highlight.ts
@@ -97,7 +97,7 @@ 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'
+    'and', 'or', 'not', 'message_time_array', 'filter', 'greater', 'less', 'greater_equal', 'less_equal'
 ]
 
 const displayRelatedCBS = [
@@ -113,7 +113,7 @@ const deprecatedCBS = [
 ]
 
 const deprecatedCBSwithParams = [
-    'greater', 'less', 'greater_equal', 'less_equal', 'remaind', 'pow'
+    'remaind', 'pow'
 ]
 
 const decorators = [

From 092543158883b82c5d22696f1ad1bdb6fd7ec2de Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 21:32:39 +0900
Subject: [PATCH 02/11] Improve automark.ts code to handle more symbols

---
 src/ts/plugins/automark.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/ts/plugins/automark.ts b/src/ts/plugins/automark.ts
index ce119d46..52c490a2 100644
--- a/src/ts/plugins/automark.ts
+++ b/src/ts/plugins/automark.ts
@@ -196,11 +196,8 @@ export function risuFormater(dat:string){
             lineResult = lineResult.substring(0,lineResult.length-1)
         }
 
-        console.log(lineResult)
-
         result += lineResult
     }
 
-    console.log(result)
     return result.trim()
 }
\ No newline at end of file

From f4c10b8395206d3092ee16679cb3967be8d9fc29 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 21:55:22 +0900
Subject: [PATCH 03/11] improve translation

---
 src/lib/ChatScreens/Chat.svelte               | 28 +++++++++++++------
 src/lib/Setting/Pages/AdvancedSettings.svelte |  3 ++
 src/ts/parser.ts                              | 25 +++++++++++++----
 src/ts/storage/database.ts                    |  2 ++
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte
index 2bafe476..c4657710 100644
--- a/src/lib/ChatScreens/Chat.svelte
+++ b/src/lib/ChatScreens/Chat.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { ArrowLeft, ArrowRight, PencilIcon, LanguagesIcon, RefreshCcwIcon, TrashIcon, CopyIcon, Volume2Icon, BotIcon, ArrowLeftRightIcon, UserIcon } from "lucide-svelte";
-    import { ParseMarkdown, type simpleCharacterArgument } from "../../ts/parser";
+    import { ParseMarkdown, postTranslationParse, type simpleCharacterArgument } from "../../ts/parser";
     import AutoresizeArea from "../UI/GUI/TextAreaResizable.svelte";
     import { alertConfirm, alertError, alertRequestData } from "../../ts/alert";
     import { language } from "../../lang";
@@ -102,13 +102,25 @@
             } catch (error) {}
         }
             if(translateText){
-                const marked = await ParseMarkdown(data, charArg, mode, chatID)
-                translating = true
-                const translated = await translateHTML(marked, false, charArg, chatID)
-                translating = false
-                lastParsed = translated
-                lastCharArg = charArg
-                return translated
+                if(!$DataBase.legacyTranslation){
+                    const marked = await ParseMarkdown(data, charArg, 'pretranslate', chatID)
+                    translating = true
+                    console.log(marked)
+                    const translated = postTranslationParse(await translateHTML(marked, false, charArg, chatID))
+                    translating = false
+                    lastParsed = translated
+                    lastCharArg = charArg
+                    return translated
+                }
+                else{
+                    const marked = await ParseMarkdown(data, charArg, mode, chatID)
+                    translating = true
+                    const translated = await translateHTML(marked, false, charArg, chatID)
+                    translating = false
+                    lastParsed = translated
+                    lastCharArg = charArg
+                    return translated
+                }
             }
             else{
                 const marked = await ParseMarkdown(data, charArg, mode, chatID)
diff --git a/src/lib/Setting/Pages/AdvancedSettings.svelte b/src/lib/Setting/Pages/AdvancedSettings.svelte
index 036d9628..cf0f491e 100644
--- a/src/lib/Setting/Pages/AdvancedSettings.svelte
+++ b/src/lib/Setting/Pages/AdvancedSettings.svelte
@@ -117,6 +117,9 @@
         <Help key="removePunctuationHypa"/>
     </Check>
 </div>
+<div class="flex items-center mt-4">
+    <Check bind:check={$DataBase.legacyTranslation} name="Legacy Translator" />
+</div>
 <div class="flex items-center mt-4">
     <Check bind:check={$DataBase.dynamicAssets} name={language.dynamicAssets}>
         <Help key="dynamicAssets"/>
diff --git a/src/ts/parser.ts b/src/ts/parser.ts
index 925226b8..d95dbf38 100644
--- a/src/ts/parser.ts
+++ b/src/ts/parser.ts
@@ -169,25 +169,24 @@ export interface simpleCharacterArgument{
 }
 
 
-export async function ParseMarkdown(data:string, charArg:(character|simpleCharacterArgument | groupChat | string) = null, mode:'normal'|'back' = 'normal', chatID=-1) {
+export async function ParseMarkdown(data:string, charArg:(character|simpleCharacterArgument | groupChat | string) = null, mode:'normal'|'back'|'pretranslate' = 'normal', chatID=-1) {
     let firstParsed = ''
-    const orgDat = data
-    const db = get(DataBase)
+    const additionalAssetMode = (mode === 'back') ? 'back' : 'normal'
     let char = (typeof(charArg) === 'string') ? (findCharacterbyId(charArg)) : (charArg)
     if(char && char.type !== 'group'){
-        data = await parseAdditionalAssets(data, char, mode, 'pre')
+        data = await parseAdditionalAssets(data, char, additionalAssetMode, 'pre')
         firstParsed = data
     }
     if(char){
         data = (await processScriptFull(char, data, 'editdisplay', chatID)).data
     }
     if(firstParsed !== data && char && char.type !== 'group'){
-        data = await parseAdditionalAssets(data, char, mode, 'post')
+        data = await parseAdditionalAssets(data, char, additionalAssetMode, 'post')
     }
     data = await parseInlayImages(data)
 
     data = encodeStyle(data)
-    if(mode !== 'back'){
+    if(mode === 'normal'){
         data = risuFormater(data)
         data = mconverted.parse(data)
     }
@@ -197,6 +196,20 @@ export async function ParseMarkdown(data:string, charArg:(character|simpleCharac
     }))
 }
 
+export function postTranslationParse(data:string){
+    let lines = risuFormater(data).split('\n')
+
+    for(let i=0;i<lines.length;i++){
+        const trimed = lines[i].trim()
+        if(trimed.startsWith('<')){
+            lines[i] = trimed
+        }
+    }
+
+    data = mconverted.parse(lines.join('\n'))
+    return data
+}
+
 export function parseMarkdownSafe(data:string) {
     return DOMPurify.sanitize(mconverted.parse(data), {
         FORBID_TAGS: ["a", "style"],
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index bbe625b6..1f432cb0 100644
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -418,6 +418,7 @@ export function setDatabase(data:Database){
     data.lineHeight ??= 1.25
     data.stabilityModel ??= 'sd3-large'
     data.stabllityStyle ??= ''
+    data.legacyTranslation ??= false
     changeLanguage(data.language)
     DataBase.set(data)
 }
@@ -691,6 +692,7 @@ export interface Database{
     stabilityModel: string
     stabilityKey: string
     stabllityStyle: string
+    legacyTranslation: boolean
 }
 
 export interface customscript{

From be0cd11c26bad36d1c916395c8286f7d1405fe4e Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 22:06:28 +0900
Subject: [PATCH 04/11] rm: remove outdated plugins

---
 src/ts/plugins/fixer.ts   | 54 ---------------------------------------
 src/ts/plugins/metrica.ts | 49 -----------------------------------
 2 files changed, 103 deletions(-)
 delete mode 100644 src/ts/plugins/fixer.ts
 delete mode 100644 src/ts/plugins/metrica.ts

diff --git a/src/ts/plugins/fixer.ts b/src/ts/plugins/fixer.ts
deleted file mode 100644
index eacf379a..00000000
--- a/src/ts/plugins/fixer.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { get } from "svelte/store"
-import { DataBase } from "../storage/database"
-
-export function OaifixBias(bias:{[key:number]:number}){
-    const db = get(DataBase)
-    const emdashes = [
-        2001,  2345,  8713, 16620, 17223,
-       22416, 29096, 29472, 30697, 35192,
-       38542, 41128, 44603, 49525, 50004,
-       50617, 51749, 51757, 55434, 60654,
-       61311, 63750, 63938, 63977, 66101,
-       68850, 71201, 71480, 72318, 76070,
-       76929, 80078, 81902, 83872, 84941,
-       85366, 86319, 87247, 87671, 88958,
-       90863, 93830, 96197, 99563
-    ]
-
-    const biases = []
-
-    if(db.officialplugins.oaiFixEmdash){
-        biases.push(...emdashes)
-    }
-    
-
-    for (const key of biases) {
-        bias[key] = -100
-    }
-
-    return bias
-
-}
-
-export function OaiFixKorean(text:string){
-
-    //tokenizer problem fixes
-    const replacer = {
-        //commonly wrong english
-        '피츠': '피스',
-        '스커츠': '스커트',
-        '스파츠': '스커트',
-        '스마트폰': '스파트폰',
-        '스위츠': '스위치',
-        '해도 되': '해도 돼',
-        '해도 됩니다': '해도 돼요',
-        '에레베이터': '엘리베이터',
-        '에리베이터': '엘리베이터',
-        '에레바토르': '엘리베이터',
-    }
-
-    for (const key in replacer) {
-        text = text.replace(key, replacer[key])
-    }
-    return text
-}
\ No newline at end of file
diff --git a/src/ts/plugins/metrica.ts b/src/ts/plugins/metrica.ts
deleted file mode 100644
index f930db03..00000000
--- a/src/ts/plugins/metrica.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-// [from, to, ratio, isMetrica]
-const convertion:[string,string,number, boolean][] = [
-    ['kg', 'lbs', 2.20462, true],
-    ['m', 'ft', 3.28084, true],
-    ['cm', 'inch', 0.393701, false],
-    ['mm', 'inch', 0.0393701, false],
-    ['km', 'mi', 0.621371, false],
-    ['killogram', 'pound', 2.20462, true],
-    ['meter', 'foot', 3.28084, true],
-    ['centimeter', 'inch', 0.393701, true],
-    ['millimeter', 'inch', 0.0393701, true],
-    ['kilometer', 'mile', 0.621371, true],
-]
-
-export function metricaPlugin(data:string, toSystem:'metrics'|'imperial'){
-    const c = convertion.sort((a,b) => b[0].length - a[0].length);    
-    for(let i = 0; i < c.length; i++){
-        let [from, to, ratio] = c[i];
-        if(toSystem !== 'imperial'){
-            [from, to] = [to, from];
-            ratio = 1 / ratio;
-        }
-        if(!c[i][3]){
-            from = from + ' '
-            to = to + ' '
-        }
-        const reg = new RegExp(`(\\d+(?:\\.\\d+)?)\\s*${from}`, 'g');
-        data = data.replace(reg, (_, value) => {
-            // if value is integer, parse it as integer
-            if(value.indexOf('.') === -1){
-                const result = parseInt(value) * ratio
-                return `${result.toFixed(0)} ${to}`;
-            }
-
-            const result = parseFloat(value) * ratio;
-            return `${result.toFixed(2)} ${to}`;
-        });
-    }
-    //convert height like 5' 11'' to 180 cm
-    if(toSystem === 'metrics'){
-        const reg = /(\d+)'\s*(\d+)"/g;
-        data = data.replace(reg, (_, feet, inch) => {
-            const result = parseFloat(feet) * 30.48 + parseFloat(inch) * 2.54;
-            return `${result.toFixed(2)} cm`;
-        });
-    }
-    
-    return data
-}
\ No newline at end of file

From 22a06a4d7d5ff0005eab91a1657d08289a9049bc Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 22:08:04 +0900
Subject: [PATCH 05/11] remove outdated plugins

---
 src/lang/en.ts                              |  1 +
 src/lib/Setting/Pages/PluginSettings.svelte | 27 ++++-----------------
 src/ts/plugins/plugins.ts                   |  1 +
 src/ts/process/request.ts                   |  8 ------
 src/ts/process/scripts.ts                   | 11 ---------
 5 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index d56051eb..5c7113f2 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -655,4 +655,5 @@ export const languageEnglish = {
     lineHeight: "Line Height",
     loadAutoServerBackup: "Load Auto Server Backup",
     notCharxWarn: "This character uses multiple assets. it is recommended to export this character as a CharX format for better compatibility.",
+    noPlugins: "No Plugins Installed",
 }
\ No newline at end of file
diff --git a/src/lib/Setting/Pages/PluginSettings.svelte b/src/lib/Setting/Pages/PluginSettings.svelte
index 9ab4793e..dbdd194e 100644
--- a/src/lib/Setting/Pages/PluginSettings.svelte
+++ b/src/lib/Setting/Pages/PluginSettings.svelte
@@ -17,29 +17,12 @@
 <span class="text-draculared text-xs mb-4">{language.pluginWarn}</span>
 
 
-<div class="border-solid border-borderc p-2 flex flex-col border-1">
-    <div class="flex">
-        <span class="font-bold flex-grow">Metric Systemizer <Help key="metrica" /> <span class="text-green-500 italic">(Official Plugin)</span></span>
-    </div>
-    <div class="flex items-center mt-2">
-        <Check bind:check={$DataBase.officialplugins.metrica} name={language.able}/>
-    </div>
-    <div class="flex">
-        <span class="font-bold flex-grow">OpenAI Fixer <Help key="openAIFixer" /> <span class="text-green-500 italic">(Official Plugin)</span></span>
-    </div>
-    <div class="flex items-center mt-2">
-        <Check bind:check={$DataBase.officialplugins.oaiFix} name={language.able}/>
-    </div>
-    {#if $DataBase.officialplugins.oaiFix}
-        <div class="flex items-center mt-2">
-            <Check bind:check={$DataBase.officialplugins.oaiFixEmdash} name={"Remove Emdash"}/>
-        </div>
-        <div class="flex items-center mt-2">
-            <Check bind:check={$DataBase.officialplugins.oaiFixLetters} name={"Fix Letters"}/>
-        </div>
+<div class="border-solid border-darkborderc p-2 flex flex-col border-1">
+    {#if !$DataBase.plugins || $DataBase.plugins?.length === 0}
+        <span class="text-textcolor2">{language.noPlugins}</span>
     {/if}
     {#each $DataBase.plugins as plugin, i}
-        <div class="border-borderc mt-2 mb-2 w-full border-solid border-b-1 seperator"></div>
+        <div class="border-darkborderc mt-2 mb-2 w-full border-solid border-b-1 seperator"></div>
         <div class="flex">
             <span class="font-bold flex-grow">{plugin.displayName ?? plugin.name}</span>
             <button class="textcolor2 hover:gray-200 cursor-pointer" on:click={async () => {
@@ -48,7 +31,7 @@
                     if($DataBase.currentPluginProvider === plugin.name){
                         $DataBase.currentPluginProvider  = ''
                     }
-                    let plugins = $DataBase.plugins
+                    let plugins = $DataBase.plugins ?? []
                     plugins.splice(i, 1)
                     $DataBase.plugins = plugins
                 }
diff --git a/src/ts/plugins/plugins.ts b/src/ts/plugins/plugins.ts
index 3acfa1d1..1f65d37d 100644
--- a/src/ts/plugins/plugins.ts
+++ b/src/ts/plugins/plugins.ts
@@ -93,6 +93,7 @@ export async function importPlugin(){
             displayName: displayName
         }
 
+        db.plugins ??= []
         db.plugins.push(pluginData)
 
         DataBase.set(db)
diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index d7d158f8..dd0d0a30 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -15,7 +15,6 @@ import { HttpRequest } from "@smithy/protocol-http";
 import { Sha256 } from "@aws-crypto/sha256-js";
 import { v4 } from "uuid";
 import { supportsInlayImage } from "./files/image";
-import { OaifixBias } from "../plugins/fixer";
 import { Capacitor } from "@capacitor/core";
 import { getFreeOpenRouterModel } from "../model/openrouter";
 import { runTransformers } from "./transformers";
@@ -254,13 +253,6 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
 
                 }
             }
-            if(raiModel.startsWith('gpt')){
-                if(db.officialplugins.oaiFix){
-                    bias = OaifixBias(bias)
-                }
-            }
-
-
 
 
             let oaiFunctions:OaiFunctions[] = []
diff --git a/src/ts/process/scripts.ts b/src/ts/process/scripts.ts
index eb336738..b502e3f1 100644
--- a/src/ts/process/scripts.ts
+++ b/src/ts/process/scripts.ts
@@ -7,8 +7,6 @@ import { language } from "src/lang";
 import { selectSingleFile } from "../util";
 import { assetRegex, risuChatParser as risuChatParserOrg, type simpleCharacterArgument } from "../parser";
 import { runCharacterJS } from "../plugins/embedscript";
-import { metricaPlugin } from "../plugins/metrica";
-import { OaiFixKorean } from "../plugins/fixer";
 import { getModuleRegexScripts } from "./modules";
 import { HypaProcesser } from "./memory/hypamemory";
 
@@ -62,15 +60,6 @@ export async function processScriptFull(char:character|groupChat|simpleCharacter
     let db = get(DataBase)
     let emoChanged = false
     const scripts = (db.globalscript ?? []).concat(char.customscript).concat(getModuleRegexScripts())
-    if(db.officialplugins.metrica && mode === 'editdisplay'){
-        data = metricaPlugin(data, 'metrics')
-    }
-    if(db.officialplugins.metrica && (mode === 'editinput' || mode === 'editoutput' || mode === 'editprocess')){
-        data = metricaPlugin(data, 'imperial')
-    }
-    if(db.officialplugins.oaiFixLetters && db.officialplugins.oaiFix && (mode === 'editoutput' || mode === 'editdisplay')){
-        data = OaiFixKorean(data)
-    }
     data = await runCharacterJS({
         code: char.virtualscript ?? null,
         mode,

From 401e83b9166d39a2ccbe8d4ad03f9566230d6c6b Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 22:14:04 +0900
Subject: [PATCH 06/11] Move legacy translation

---
 src/lang/en.ts                                | 2 ++
 src/lib/Setting/Pages/AdvancedSettings.svelte | 3 ---
 src/lib/Setting/Pages/LanguageSettings.svelte | 6 ++++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index 5c7113f2..f14c1f51 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -131,6 +131,7 @@ export const languageEnglish = {
         defaultVariables: "Here you can define your own default variables. use `<variable name>=<variable value>` format, seperated by newline. for example, `name=RisuAI`, which then can be used with trigger scripts and variables CBS like `{{getvar::A}}`, `{{setvar::A::B}}` or `{{? $A + 1}}`. if prompt template's default variable and character's default variable has same name, character's default variable will be used.",
         lowLevelAccess: "If enabled, it will enable access to features that requires high computing powers and executing AI model via triggers in the character. do not enable this unless you really need these features.",
         triggerLLMPrompt: "A prompt that would be sent to the model. you can use multi turns and roles by using `@@role user`, `@@role system`, `@@role assistant`. for example, \n\`\`\`\n@@role system\nrespond as hello\n@@role assistant\nhello\n@@role user\nhi\n\`\`\`",
+        legacyTranslation: "If enabled, it will use the old translation method, which preprocess markdown and quotes before translations instead of postprocessing after translations."
     },
     setup: {
         chooseProvider: "Choose AI Provider",
@@ -656,4 +657,5 @@ export const languageEnglish = {
     loadAutoServerBackup: "Load Auto Server Backup",
     notCharxWarn: "This character uses multiple assets. it is recommended to export this character as a CharX format for better compatibility.",
     noPlugins: "No Plugins Installed",
+    legacyTranslation: "Legacy Translation",
 }
\ No newline at end of file
diff --git a/src/lib/Setting/Pages/AdvancedSettings.svelte b/src/lib/Setting/Pages/AdvancedSettings.svelte
index cf0f491e..036d9628 100644
--- a/src/lib/Setting/Pages/AdvancedSettings.svelte
+++ b/src/lib/Setting/Pages/AdvancedSettings.svelte
@@ -117,9 +117,6 @@
         <Help key="removePunctuationHypa"/>
     </Check>
 </div>
-<div class="flex items-center mt-4">
-    <Check bind:check={$DataBase.legacyTranslation} name="Legacy Translator" />
-</div>
 <div class="flex items-center mt-4">
     <Check bind:check={$DataBase.dynamicAssets} name={language.dynamicAssets}>
         <Help key="dynamicAssets"/>
diff --git a/src/lib/Setting/Pages/LanguageSettings.svelte b/src/lib/Setting/Pages/LanguageSettings.svelte
index 4f54c5ef..23cdfe32 100644
--- a/src/lib/Setting/Pages/LanguageSettings.svelte
+++ b/src/lib/Setting/Pages/LanguageSettings.svelte
@@ -127,4 +127,10 @@
             <Help key="combineTranslation"/>
         </Check>
     </div>
+
+    <div class="flex items-center mt-4">
+        <Check bind:check={$DataBase.legacyTranslation} name={language.legacyTranslation}>
+            <Help key="legacyTranslation"/>
+        </Check>
+    </div>
 {/if}
\ No newline at end of file

From 8a8befecdafc0f0af6409c307a374288dab30594 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 22:20:00 +0900
Subject: [PATCH 07/11] remove v1 fallback to use oldtavernchar fallback

---
 src/ts/characterCards.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/ts/characterCards.ts b/src/ts/characterCards.ts
index 68170d7f..a266e171 100644
--- a/src/ts/characterCards.ts
+++ b/src/ts/characterCards.ts
@@ -222,16 +222,6 @@ async function importCharacterProcess(f:{
                 return db.characters.length - 1
             }
         }
-        if(checkedVersion === 'v1'){
-            const converted = CCardLib.character.convert(parsed, {
-                from: 'v1',
-                to: 'v2'
-            })
-            if(await importCharacterCardSpec(converted, img, "normal", assets)){
-                let db = get(DataBase)
-                return db.characters.length - 1
-            }
-        }
     }
     const charaData:OldTavernChar = JSON.parse(Buffer.from(readedChara, 'base64').toString('utf-8'))
     console.log(charaData)

From af8a2135511ea3ae9d72f2cec249ba0e1e0d06c5 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 22:24:38 +0900
Subject: [PATCH 08/11] add screenshot progress indicator

---
 src/lib/ChatScreens/DefaultChatScreen.svelte | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte
index a9ec6233..1e4207d9 100644
--- a/src/lib/ChatScreens/DefaultChatScreen.svelte
+++ b/src/lib/ChatScreens/DefaultChatScreen.svelte
@@ -338,11 +338,14 @@
 
             for(const chat of chats){
                 const cnv = await html2canvas.toCanvas(chat as HTMLElement)
+                alertWait("Taking screenShot... "+canvases.length+"/"+chats.length)
                 canvases.push(cnv)
             }
 
             canvases.reverse()
 
+            alertWait("Merging images...")
+            
             let mergedCanvas = document.createElement('canvas');
             mergedCanvas.width = 0;
             mergedCanvas.height = 0;

From 78812be474c40814ff826c84cdb99ceb924005cc Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 22:25:19 +0900
Subject: [PATCH 09/11] refactor: Remove console.log statement in automark.ts

---
 src/ts/plugins/automark.ts    | 2 --
 src/ts/plugins/embedscript.ts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/ts/plugins/automark.ts b/src/ts/plugins/automark.ts
index 52c490a2..7fb74c1a 100644
--- a/src/ts/plugins/automark.ts
+++ b/src/ts/plugins/automark.ts
@@ -94,8 +94,6 @@ export function risuFormater(dat:string){
         }
     }
 
-    console.log(lines)
-
     let result = ''
     for(let i=0;i<lines.length;i++){
         if(lines[i][0] !== ''){
diff --git a/src/ts/plugins/embedscript.ts b/src/ts/plugins/embedscript.ts
index 3a44e62b..7c6b2553 100644
--- a/src/ts/plugins/embedscript.ts
+++ b/src/ts/plugins/embedscript.ts
@@ -284,8 +284,6 @@ export async function runCharacterJS(arg:{
 
             const runCode = codes[arg.mode]
 
-            console.log(compCode[code])
-
             if(!compCode[code].includes(runCode)){
                 continue
             }

From f119739bb94b6555f3a8cc68fe9887ccb35f1f67 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Tue, 18 Jun 2024 22:31:21 +0900
Subject: [PATCH 10/11] chore: Bump version to 114.5.0

---
 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 a27c323e..7784cdba 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.4.0"
+        versionName "114.5.0"
         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 6dc38819..777b8455 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.4.0",
+      "versionName": "114.5.0",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index b6a2dd98..6ed8cffa 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "RisuAI",
-    "version": "114.4.0"
+    "version": "114.5.0"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index 1f432cb0..959f9a15 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.4.0"
+export let appVer = "114.5.0"
 export let webAppSubVer = ''
 
 export function setDatabase(data:Database){
diff --git a/version.json b/version.json
index d2eb6bd1..6a568ef8 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{"version":"114.4.0"}
\ No newline at end of file
+{"version":"114.5.0"}
\ No newline at end of file

From 507c3e629accbda81e26835324b4c9d782ac3450 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Wed, 19 Jun 2024 02:42:18 +0900
Subject: [PATCH 11/11] add export via htmls

---
 src/lang/en.ts                     |   5 +
 src/lib/UI/Realm/RealmPopUp.svelte |   2 +-
 src/ts/characters.ts               | 161 +++++++++++++++++++++++++++--
 3 files changed, 159 insertions(+), 9 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index f14c1f51..4f2785bc 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -658,4 +658,9 @@ export const languageEnglish = {
     notCharxWarn: "This character uses multiple assets. it is recommended to export this character as a CharX format for better compatibility.",
     noPlugins: "No Plugins Installed",
     legacyTranslation: "Legacy Translation",
+    clipboardSuccess: "Copied to Clipboard",
+    translateContent: 'Translate Content',
+    doNotTranslate: "Do Not Translate",
+    includePersonaName: "Include Persona Name",
+    hidePersonaName: "Hide Persona Name",
 }
\ No newline at end of file
diff --git a/src/lib/UI/Realm/RealmPopUp.svelte b/src/lib/UI/Realm/RealmPopUp.svelte
index defb9f1d..a1fd7761 100644
--- a/src/lib/UI/Realm/RealmPopUp.svelte
+++ b/src/lib/UI/Realm/RealmPopUp.svelte
@@ -95,7 +95,7 @@
             {/if}
             <button class="text-textcolor2 hover:text-green-500" on:click|stopPropagation={async () => {
                 await navigator.clipboard.writeText(`https://realm.risuai.net/character/${openedData.id}`)
-                alertNormal("Copied to clipboard")
+                alertNormal(language.clipboardSuccess)
             }}>
                 <PaperclipIcon />
             </button>
diff --git a/src/ts/characters.ts b/src/ts/characters.ts
index ff7fd1d4..8c443b64 100644
--- a/src/ts/characters.ts
+++ b/src/ts/characters.ts
@@ -1,6 +1,6 @@
 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 } from "./alert";
+import { alertConfirm, alertError, alertNormal, alertSelect, alertStore, alertWait } from "./alert";
 import { language } from "../lang";
 import { decode as decodeMsgpack } from "msgpackr";
 import { checkNullish, findCharacterbyId, selectMultipleFile, selectSingleFile, sleep } from "./util";
@@ -10,6 +10,8 @@ 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";
 
 export function createNewCharacter() {
     let db = get(DataBase)
@@ -153,12 +155,31 @@ export async function rmCharEmotion(charId:number, emotionId:number) {
 export async function exportChat(page:number){
     try {
 
-        const mode = await alertSelect(['Export as JSON', "Export as TXT"])
+        const mode = await alertSelect(['Export as JSON', "Export as TXT", "Export as HTML File", "Export as HTML Embed"])
+        const doTranslate = (mode === '2' || mode === '3') ? (await alertSelect([language.translateContent, language.doNotTranslate])) === '0' : false
+        const anonymous = (mode === '2' || mode === '3') ? ((await alertSelect([language.includePersonaName, language.hidePersonaName])) === '1') : false
         const selectedID = get(selectedCharID)
         const db = get(DataBase)
         const chat = db.characters[selectedID].chats[page]
         const char = db.characters[selectedID]
         const date = new Date().toJSON();
+        const htmlChatParse = async (v:string) => {
+            v = parseMarkdownSafe(v)
+
+            if(doTranslate){
+                v = await translateHTML(v, false, '', -1)
+            }
+
+            if(anonymous){
+                //case insensitive match, replace all
+                const excapedName = char.name.replace(/[-\/\\^$*+\?\.()|[\]{}]/g, '\\$&')
+
+                v = v.replace(new RegExp(`${excapedName}`, 'gi'), '×××')
+            }
+
+            return v
+        }
+
         if(mode === '0'){
             const stringl = Buffer.from(JSON.stringify({
                 type: 'risuChat',
@@ -168,20 +189,132 @@ export async function exportChat(page:number){
     
             await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.json', stringl)
     
+        }
+        else if(mode === '2'){
+
+            let chatContentHTML = ''
+
+            let i = 0
+            for(const v of chat.message){
+                alertWait(`Translating... ${i++}/${chat.message.length}`)
+                const name = v.saying ? findCharacterbyId(v.saying).name : v.role === 'char' ? char.name : anonymous ? '×××' : db.username
+                chatContentHTML += `<div class="chat">
+                    <h2>${name}</h2>
+                    <div>${await htmlChatParse(v.data)}</div>
+                </div>`
+            }
+
+            const doc = `
+                <!DOCTYPE html>
+                <html>
+                    <head>
+                        <title>${char.name} Chat</title>
+                        <style>
+                            body{
+                                font-family: Arial, sans-serif;
+                                display: flex;
+                                justify-content: center;
+                            }
+                            .container{
+                                max-width: 800px;
+                                padding: 1rem;
+                                border-radius: 10px;
+                                display: flex;
+                                flex-direction: column;
+                                gap: 1rem;
+                            }
+                            .chat{
+                                background: #f0f0f0;
+                                padding: 1rem;
+                                border-radius: 10px;
+                                display: flex;
+                                flex-direction: column;
+                            }
+                            .idat{
+                                display: none;
+                            }
+                            h2{
+                                margin: 0;
+                            }
+                            .chat div{
+                                margin-top: 0.5rem;
+                                break-word: break-all;
+                            }
+                        </style>
+                    </head>
+                    <body>
+                        <div class="container">
+                            <div class="chat">
+                                <h2>${char.name}</h2>
+                                <div>${await htmlChatParse(
+                                    char.firstMsgIndex === -1 ? char.firstMessage : char.alternateGreetings?.[char.firstMsgIndex ?? 0]
+                                )}</div>
+                            </div>
+                            ${chatContentHTML}
+                        </div>
+                        <div class="idat">${
+                            JSON.stringify(chat).replace(/</g, '&lt;').replace(/>/g, '&gt;')
+                        }</div>
+                    </body>
+            `
+
+
+            await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.html', Buffer.from(doc, 'utf-8'))
+        }
+        else if(mode === '3'){
+            //create a html table
+            let chatContentHTML = ''
+
+            let i = 0
+            for(const v of chat.message){
+                alertWait(`Translating... ${i++}/${chat.message.length}`)
+                const name = v.saying ? findCharacterbyId(v.saying).name : v.role === 'char' ? char.name : anonymous ? '×××' : db.username
+                chatContentHTML += `<tr>
+                    <td>${name}</td>
+                    <td>${await htmlChatParse(v.data)}</td>
+                </tr>`
+            }
+
+            const template = `
+                <table>
+                    <tr>
+                        <th>Character</th>
+                        <th>Message</th>
+                    </tr>
+                    <tr>
+                        <td>${char.name}</td>
+                        <td>${await htmlChatParse(char.firstMessage)}</td>
+                    </tr>
+                    ${chatContentHTML}
+                </table>
+                <p>Chat from RisuAI</p>
+            `
+
+            //copy to clipboard
+
+            const item = new ClipboardItem({
+                'text/html': new Blob([template], { type: 'text/html' }),
+                'text/plain': new Blob([template], { type: 'text/plain' })
+            })
+            await navigator.clipboard.write([item])
+
+            alertNormal(language.clipboardSuccess)
+            return
+
         }
         else{
             
             let stringl = chat.message.map((v) => {
                 if(v.saying){
-                    return `${findCharacterbyId(v.saying).name}\n${v.data}`
+                    return `--${findCharacterbyId(v.saying).name}\n${v.data}`
                 }
                 else{
-                    return `${v.role === 'char' ? char.name : db.username}\n${v.data}`
+                    return `--${v.role === 'char' ? char.name : db.username}\n${v.data}`
                 }
             }).join('\n\n')
 
             if(char.type !== 'group'){
-                stringl = `${char.name}\n${char.firstMessage}\n\n` + stringl
+                stringl = `--${char.name}\n${char.firstMessage}\n\n` + stringl
             }
 
             await downloadFile(`${char.name}_${date}_chat`.replace(/[<>:"/\\|?*\.\,]/g, "") + '.txt', Buffer.from(stringl, 'utf-8'))
@@ -194,7 +327,7 @@ export async function exportChat(page:number){
 }
 
 export async function importChat(){
-    const dat =await selectSingleFile(['json','jsonl'])
+    const dat =await selectSingleFile(['json','jsonl','txt','html'])
     if(!dat){
         return
     }
@@ -236,7 +369,7 @@ export async function importChat(){
             setDatabase(db)
             alertNormal(language.successImport)
         }
-        else{
+        else if(dat.name.endsWith('json')){
             const json = JSON.parse(Buffer.from(dat.data).toString('utf-8'))
             if(json.type === 'risuChat' && json.ver === 1){
                 const das:Chat = json.data
@@ -256,7 +389,19 @@ export async function importChat(){
                 return
             }
         }
-
+        else if(dat.name.endsWith('html')){
+            const doc = new DOMParser().parseFromString(Buffer.from(dat.data).toString('utf-8'), 'text/html')
+            const chat = doc.querySelector('.idat').textContent
+            const json = JSON.parse(chat)
+            if(json.message && json.note && json.name && json.localLore){
+                db.characters[selectedID].chats.unshift(json)
+                setDatabase(db)
+                alertNormal(language.successImport)
+            }
+            else{
+                alertError(language.errors.noData)
+            }
+        }
     } catch (error) {
         alertError(`${error}`)
     }