Merge pull request #2669 from SillyTavern/name2-prefix-trim

Don't trim names in message prefixes if allowed with settings
This commit is contained in:
Cohee 2024-08-16 22:36:50 +03:00 committed by GitHub
commit f9cfb39621
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -5426,9 +5426,11 @@ export function cleanUpMessage(getMessage, isImpersonate, isContinue, displayInc
getMessage = fixMarkdown(getMessage, false);
}
const nameToTrim2 = isImpersonate ? name1 : name2;
const nameToTrim2 = isImpersonate
? (!power_user.allow_name1_display ? name1 : '')
: (!power_user.allow_name2_display ? name2 : '');
if (getMessage.startsWith(nameToTrim2 + ':')) {
if (nameToTrim2 && getMessage.startsWith(nameToTrim2 + ':')) {
getMessage = getMessage.replace(nameToTrim2 + ':', '');
getMessage = getMessage.trimStart();
}