mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'main' into dev
This commit is contained in:
@ -1405,7 +1405,12 @@ function getExtensionPrompt(position = 0, depth = undefined, separator = "\n") {
|
||||
|
||||
function baseChatReplace(value, name1, name2) {
|
||||
if (value !== undefined && value.length > 0) {
|
||||
value = substituteParams(value, is_pygmalion ? "You" : name1, name2);
|
||||
if (is_pygmalion) {
|
||||
value = value.replace(/{{user}}:/gi, 'You:');
|
||||
value = value.replace(/<USER>:/gi, 'You:');
|
||||
}
|
||||
|
||||
value = substituteParams(value, name1, name2);
|
||||
|
||||
if (power_user.collapse_newlines) {
|
||||
value = collapseNewlines(value);
|
||||
|
Reference in New Issue
Block a user