rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into webpack

Browse Source
This commit is contained in:
Cohee
2024-10-26 19:11:29 +03:00
parent 2e80c7ceb2 2c7e9729bc
commit f5bdb52c25
12 changed files with 90 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/script.js
View File

@ -2577,7 +2577,7 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re
if (_replaceCharacterCard) {
const fields = getCharacterCardFields();
environment.charPrompt = fields.system || '';
environment.charJailbreak = fields.jailbreak || '';
environment.charInstruction = environment.charJailbreak = fields.jailbreak || '';
environment.description = fields.description || '';
environment.personality = fields.personality || '';
environment.scenario = fields.scenario || '';
@ -3847,7 +3847,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
if (addUserAlignment) {
const alignmentMessage = {
name: name1,
mes: power_user.instruct.user_alignment_message,
mes: substituteParams(power_user.instruct.user_alignment_message),
is_user: true,
};
userAlignmentMessage = formatMessageHistoryItem(alignmentMessage, isInstruct, force_output_sequence.FIRST);
@ -8225,6 +8225,10 @@ window['SillyTavern'].getContext = function () {
substituteParams,
substituteParamsExtended,
SlashCommandParser,
SlashCommand,
SlashCommandArgument,
SlashCommandNamedArgument,
ARGUMENT_TYPE,
executeSlashCommandsWithOptions,
/** @deprecated Use SlashCommandParser.addCommandObject() instead */
registerSlashCommand: registerSlashCommand,