mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[console] update

Browse Source
This commit is contained in:
kwaroran
2023-11-14 17:55:48 +09:00
parent 526ce55405
commit 244febc911
2 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/lib/ChatScreens/Chat.svelte
View File

@@ -88,25 +88,26 @@
}
} catch (error) {}
}
if(translateText){
const marked = await ParseMarkdown(data, charArg, mode, chatID)
translating = true
const translated = await translateHTML(marked, false)
translating = false
lastParsed = translated
lastCharArg = charArg
return translated
}
else{
const marked = await ParseMarkdown(data, charArg, mode, chatID)
lastParsed = marked
lastCharArg = charArg
return marked
}
if(translateText){
const marked = await ParseMarkdown(data, charArg, mode, chatID)
translating = true
const translated = await translateHTML(marked, false)
translating = false
lastParsed = translated
lastCharArg = charArg
return translated
}
else{
const marked = await ParseMarkdown(data, charArg, mode, chatID)
lastParsed = marked
lastCharArg = charArg
return marked
}
} catch (error) {
//retry
if(tries > 2){
alertError(`Error while parsing chat message: ${error}`)
alertError(`Error while parsing chat message: ${translateText}, ${error.message}`)
return data
}
return await markParsing(data, charArg, mode, chatID, translateText, (tries ?? 0) + 1)
@@ -194,11 +195,11 @@
style:font-size="{0.875 * ($DataBase.zoomsize / 100)}rem"
style:line-height="{1.25 * ($DataBase.zoomsize / 100)}rem"
>
{#await markParsing(msgDisplay, character, 'normal', idx, translated)}
{@html lastParsed}
{:then md}
{@html md}
{/await}
{#await markParsing(msgDisplay, character, 'normal', idx, translated)}
{@html lastParsed}
{:then md}
{@html md}
{/await}
</span>
{/if}
</span>

26
src/ts/parser.ts
View File

@@ -52,9 +52,11 @@ DOMPurify.addHook("uponSanitizeAttribute", (node, data) => {
break
}
case 'class':{
data.attrValue = data.attrValue.split(' ').map((v) => {
return "x-risu-" + v
}).join(' ')
if(data.attrValue){
data.attrValue = data.attrValue.split(' ').map((v) => {
return "x-risu-" + v
}).join(' ')
}
break
}
}
@@ -180,14 +182,16 @@ function decodeStyle(text:string){
if(rule.selectors){
for(let i=0;i<rule.selectors.length;i++){
let slt:string = rule.selectors[i]
let selectors = slt.split(' ').map((v) => {
if(v.startsWith('.')){
return ".x-risu-" + v.substring(1)
}
return v
}).join(' ')
rule.selectors[i] = ".chattext " + selectors
if(slt){
let selectors = (slt.split(' ') ?? []).map((v) => {
if(v.startsWith('.')){
return ".x-risu-" + v.substring(1)
}
return v
}).join(' ')
rule.selectors[i] = ".chattext " + selectors
}
}
}
}