From e19b672755cda59f49d8b9ec2e3487eff35dc2bd Mon Sep 17 00:00:00 2001 From: sub-hub Date: Sat, 4 May 2024 18:04:13 +0900 Subject: [PATCH] refactor: translateHTML function handle charArg with reusable variable --- src/ts/translator/translator.ts | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/ts/translator/translator.ts b/src/ts/translator/translator.ts index 60d46a5d..7bdad824 100644 --- a/src/ts/translator/translator.ts +++ b/src/ts/translator/translator.ts @@ -211,6 +211,25 @@ export function isExpTranslator(){ } export async function translateHTML(html: string, reverse:boolean, charArg:simpleCharacterArgument|string = '', chatID:number): Promise { + let alwaysExistChar: character | groupChat | simpleCharacterArgument; + if(charArg !== ''){ + if(typeof(charArg) === 'string'){ + const db = get(DataBase) + const charId = get(selectedCharID) + alwaysExistChar = db.characters[charId] + } + else{ + alwaysExistChar=charArg + } + } else { + alwaysExistChar = { + type: 'simple', + customscript: [], + virtualscript: null, + emotionImages: [], + chaId: 'simple' + } + } let db = get(DataBase) let DoingChat = get(doingChat) if(DoingChat){ @@ -342,16 +361,7 @@ export async function translateHTML(html: string, reverse:boolean, charArg:simpl if(charArg !== ''){ let scripts:customscript[] = [] - if(typeof(charArg) === 'string'){ - const db = get(DataBase) - const charId = get(selectedCharID) - const char = db.characters[charId] - scripts = (getModuleRegexScripts() ?? []).concat(char?.customscript ?? []) - } - else{ - scripts = (getModuleRegexScripts() ?? []).concat(charArg?.customscript ?? []) - - } + scripts = (getModuleRegexScripts() ?? []).concat(alwaysExistChar?.customscript ?? []) for(const script of scripts){ if(script.type === 'edittrans'){ const reg = new RegExp(script.in, script.ableFlag ? script.flag : 'g')