diff --git a/src/lang/en.ts b/src/lang/en.ts index 9601d18c..5dc39a0e 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -810,4 +810,5 @@ export const languageEnglish = { translatorPrompt: "Translation Prompt", translateBeforeHTMLFormatting: "Translate Before HTML Formatting", retranslate: "Retranslate", + loading: "Loading", } \ No newline at end of file diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte index 6ed2da91..2ae609ef 100644 --- a/src/lib/ChatScreens/Chat.svelte +++ b/src/lib/ChatScreens/Chat.svelte @@ -2,7 +2,7 @@ import { ArrowLeft, Sparkles, ArrowRight, PencilIcon, LanguagesIcon, RefreshCcwIcon, TrashIcon, CopyIcon, Volume2Icon, BotIcon, ArrowLeftRightIcon, UserIcon } from "lucide-svelte"; import { type CbsConditions, ParseMarkdown, postTranslationParse, type simpleCharacterArgument } from "../../ts/parser.svelte"; import AutoresizeArea from "../UI/GUI/TextAreaResizable.svelte"; - import { alertConfirm, alertError, alertRequestData } from "../../ts/alert"; + import { alertConfirm, alertError, alertNormal, alertRequestData, alertWait } from "../../ts/alert"; import { language } from "../../lang"; import { type MessageGenerationInfo } from "../../ts/storage/database.svelte"; import { alertStore, DBState } from 'src/ts/stores.svelte'; @@ -10,7 +10,7 @@ import { translateHTML } from "../../ts/translator/translator"; import { risuChatParser } from "src/ts/process/scripts"; import { type Unsubscriber } from "svelte/store"; - import { isEqual } from "lodash"; + import { get, isEqual, startsWith } from "lodash"; import { sayTTS } from "src/ts/process/tts"; import { capitalize, sleep } from "src/ts/util"; import { longpress } from "src/ts/gui/longtouch"; @@ -18,6 +18,8 @@ import { ConnectionOpenStore } from "src/ts/sync/multiuser"; import { onDestroy, onMount } from "svelte"; import { getModelInfo } from "src/ts/model/modellist"; + import { getCharImage } from "src/ts/characters"; + import { getFileSrc } from "src/ts/globalApi.svelte"; let translating = $state(false) let editMode = $state(false) let statusMessage:string = $state('') @@ -151,7 +153,6 @@ if(translateText){ let doRetranslate = retranslate retranslate = false - console.log(`retranslating: ${doRetranslate}`) if(DBState.db.translatorType === 'llm' && DBState.db.translateBeforeHTMLFormatting){ await sleep(100) translating = true @@ -221,7 +222,6 @@ try { const parser = new DOMParser() const doc = parser.parseFromString(risuChatParser(html ?? '', {cbsConditions: getCbsCondition()}), 'text/html') - console.log(doc.body) return doc.body } catch (error) { const placeholder = document.createElement('div') @@ -314,7 +314,101 @@ {/if} {#if DBState.db.useChatCopy && !blankMessage} -