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 'dev' of https://github.com/BlipRanger/SillyTavern into dev

Browse Source
This commit is contained in:
BlipRanger
2023-07-08 18:55:50 -04:00
parent d25eca0f29 eaa14d2804
commit a15b2892a7
11 changed files with 248 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/script.js
View File

@@ -433,6 +433,7 @@ const system_messages = {
<ul>
<li><tt>{​{user}​}</tt> - your current Persona username</li>
<li><tt>{​{char}​}</tt> - the Character's name</li>
<li><tt>{​{input}​}</tt> - the user input</li>
<li><tt>{​{time}​}</tt> - the current time</li>
<li><tt>{​{date}​}</tt> - the current date</li>
<li><tt>{{idle_duration}}</tt> - the time since the last user message was sent</li>
@@ -445,6 +446,7 @@ const system_messages = {
name: systemUserName,
force_avatar: system_avatar,
is_user: false,
is_system: true,
is_name: true,
mes: [
'<h3><span id="version_display_welcome">SillyTavern</span><div id="version_display_welcome"></div></h3>',
@@ -1138,7 +1140,20 @@ function messageFormatting(mes, ch_name, isSystem, isUser) {
mes = mes.replaceAll(substituteParams(power_user.user_prompt_bias), "");
}
mes = getRegexedString(mes, regex_placement.MD_DISPLAY);
if (!isSystem) {
let regexPlacement;
if (isUser) {
regexPlacement = regex_placement.USER_INPUT;
} else if (ch_name === "System") {
regexPlacement = regex_placement.SYSTEM;
} else if (ch_name !== name2) {
regexPlacement = regex_placement.SENDAS;
} else {
regexPlacement = regex_placement.AI_OUTPUT;
}
mes = getRegexedString(mes, regexPlacement, { isMarkdown: true });
}
if (power_user.auto_fix_generated_markdown) {
mes = fixMarkdown(mes);
@@ -1513,6 +1528,7 @@ function substituteParams(content, _name1, _name2, _original) {
content = content.replace(/{{original}}/i, _original);
}
content = content.replace(/{{input}}/gi, $('#send_textarea').val());
content = content.replace(/{{user}}/gi, _name1);
content = content.replace(/{{char}}/gi, _name2);
content = content.replace(/<USER>/gi, _name1);