mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Add {{name}} macro for instruct sequences. Resolves to an actual name behind the message (useful for group chats). When can't be determined, defaults to "System".
This commit is contained in:
@ -269,6 +269,7 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
|
|||||||
|
|
||||||
if (power_user.instruct.macro) {
|
if (power_user.instruct.macro) {
|
||||||
sequence = substituteParams(sequence, name1, name2);
|
sequence = substituteParams(sequence, name1, name2);
|
||||||
|
sequence = sequence.replace(/{{name}}/gi, name || 'System');
|
||||||
}
|
}
|
||||||
|
|
||||||
const separator = power_user.instruct.wrap ? '\n' : '';
|
const separator = power_user.instruct.wrap ? '\n' : '';
|
||||||
@ -346,6 +347,7 @@ export function formatInstructModePrompt(name, isImpersonate, promptBias, name1,
|
|||||||
|
|
||||||
if (power_user.instruct.macro) {
|
if (power_user.instruct.macro) {
|
||||||
sequence = substituteParams(sequence, name1, name2);
|
sequence = substituteParams(sequence, name1, name2);
|
||||||
|
sequence = sequence.replace(/{{name}}/gi, name || 'System');
|
||||||
}
|
}
|
||||||
|
|
||||||
const separator = power_user.instruct.wrap ? '\n' : '';
|
const separator = power_user.instruct.wrap ? '\n' : '';
|
||||||
|
Reference in New Issue
Block a user