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 neo-server

Browse Source
This commit is contained in:
Cohee
2024-04-10 00:38:35 +03:00
parent 189d096834 69d219cd7e
commit 56a72eea5c
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/script.js
View File

@ -4574,7 +4574,7 @@ function addChatsPreamble(mesSendString) {
function addChatsSeparator(mesSendString) { function addChatsSeparator(mesSendString) {
if (power_user.context.chat_start) { if (power_user.context.chat_start) {
return substituteParams(power_user.context.chat_start) + '\n' + mesSendString; return substituteParams(power_user.context.chat_start + '\n') + mesSendString;
} }
else { else {

4
public/scripts/power-user.js
View File

@ -1942,7 +1942,9 @@ export function renderStoryString(params) {
// add a newline to the end of the story string if it doesn't have one // add a newline to the end of the story string if it doesn't have one
if (output.length > 0 && !output.endsWith('\n')) { if (output.length > 0 && !output.endsWith('\n')) {
output += '\n'; if (!power_user.instruct.enabled || power_user.instruct.wrap) {
output += '\n';
}
} }
return output; return output;

1
public/scripts/templates/macros.html
View File

@ -4,6 +4,7 @@
<ul> <ul>
<li><tt>&lcub;&lcub;pipe&rcub;&rcub;</tt> – only for slash command batching. Replaced with the returned result of the previous command.</li> <li><tt>&lcub;&lcub;pipe&rcub;&rcub;</tt> – only for slash command batching. Replaced with the returned result of the previous command.</li>
<li><tt>&lcub;&lcub;newline&rcub;&rcub;</tt> – just inserts a newline.</li> <li><tt>&lcub;&lcub;newline&rcub;&rcub;</tt> – just inserts a newline.</li>
<li><tt>&lcub;&lcub;trim&rcub;&rcub;</tt> – trims newlines surrounding this macro.</li>
<li><tt>&lcub;&lcub;original&rcub;&rcub;</tt> – global prompts defined in API settings. Only valid in Advanced Definitions prompt overrides.</li> <li><tt>&lcub;&lcub;original&rcub;&rcub;</tt> – global prompts defined in API settings. Only valid in Advanced Definitions prompt overrides.</li>
<li><tt>&lcub;&lcub;input&rcub;&rcub;</tt> – the user input</li> <li><tt>&lcub;&lcub;input&rcub;&rcub;</tt> – the user input</li>
<li><tt>&lcub;&lcub;charPrompt&rcub;&rcub;</tt> – the Character's Main Prompt override</li> <li><tt>&lcub;&lcub;charPrompt&rcub;&rcub;</tt> – the Character's Main Prompt override</li>