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

Force isSystem = false on comment messages so they get formatted properly

Browse Source
This commit is contained in:
Stefan Daniel Schwarz
2023-08-26 19:26:23 +02:00
parent dd7b89aef6
commit b9a95d94a0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/script.js
View File

@ -136,7 +136,7 @@ import {
} from "./scripts/utils.js"; } from "./scripts/utils.js";
import { extension_settings, getContext, loadExtensionSettings, processExtensionHelpers, registerExtensionHelper, runGenerationInterceptors, saveMetadataDebounced } from "./scripts/extensions.js"; import { extension_settings, getContext, loadExtensionSettings, processExtensionHelpers, registerExtensionHelper, runGenerationInterceptors, saveMetadataDebounced } from "./scripts/extensions.js";
import { executeSlashCommands, getSlashCommandsHelp, registerSlashCommand } from "./scripts/slash-commands.js"; import { COMMENT_NAME_DEFAULT, executeSlashCommands, getSlashCommandsHelp, registerSlashCommand } from "./scripts/slash-commands.js";
import { import {
tag_map, tag_map,
tags, tags,
@ -1199,6 +1199,11 @@ function messageFormatting(mes, ch_name, isSystem, isUser) {
mes = ''; mes = '';
} }
// Force isSystem = false on comment messages so they get formatted properly
if (ch_name === COMMENT_NAME_DEFAULT && isSystem && !isUser) {
isSystem = false;
}
// Prompt bias replacement should be applied on the raw message // Prompt bias replacement should be applied on the raw message
if (!power_user.show_user_prompt_bias && ch_name && !isUser && !isSystem) { if (!power_user.show_user_prompt_bias && ch_name && !isUser && !isSystem) {
mes = mes.replaceAll(substituteParams(power_user.user_prompt_bias), ""); mes = mes.replaceAll(substituteParams(power_user.user_prompt_bias), "");

4
public/scripts/slash-commands.js
View File

@ -131,7 +131,7 @@ parser.addCommand('send', sendUserMessageCallback, ['add'], '<span class="monosp
const NARRATOR_NAME_KEY = 'narrator_name'; const NARRATOR_NAME_KEY = 'narrator_name';
const NARRATOR_NAME_DEFAULT = 'System'; const NARRATOR_NAME_DEFAULT = 'System';
const COMMENT_NAME_DEFAULT = 'Note'; export const COMMENT_NAME_DEFAULT = 'Note';
async function sendUserMessageCallback(_, text) { async function sendUserMessageCallback(_, text) {
if (!text) { if (!text) {
@ -385,7 +385,7 @@ async function sendCommentMessage(_, text) {
name: COMMENT_NAME_DEFAULT, name: COMMENT_NAME_DEFAULT,
is_user: false, is_user: false,
is_name: true, is_name: true,
is_system: false, is_system: true,
send_date: getMessageTimeStamp(), send_date: getMessageTimeStamp(),
mes: substituteParams(text.trim()), mes: substituteParams(text.trim()),
force_avatar: comment_avatar, force_avatar: comment_avatar,