rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging

This commit is contained in:
RossAscends 2023-11-26 01:28:35 +09:00
parent 2bed9fde70 b8d7b0922d
commit 7264e3fe83
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,8 @@ async function delayCallback(_, amount) {
async function inputCallback(_, prompt) {
// Do not remove this delay, otherwise the prompt will not show up
await delay(1);
const result = await callPopup(prompt || '', 'input');
const safeValue = DOMPurify.sanitize(prompt || '');
const result = await callPopup(safeValue, 'input');
await delay(1);
return result || '';
}
@ -1205,13 +1206,15 @@ async function executeSlashCommands(text, unescape = false) {
let unnamedArg = result.value || pipeResult;
if (typeof result.args === 'object') {
for (const [key, value] of Object.entries(result.args)) {
for (let [key, value] of Object.entries(result.args)) {
if (typeof value === 'string') {
value = substituteParams(value.trim());
if (/{{pipe}}/i.test(value)) {
result.args[key] = value.replace(/{{pipe}}/i, pipeResult || '');
value = value.replace(/{{pipe}}/i, pipeResult || '');
}
result.args[key] = substituteParams(value.trim());
result.args[key] = value;
}
}
}

8
public/scripts/variables.js
View File

@ -38,7 +38,9 @@ function addLocalVariable(name, value) {
const increment = Number(value);
if (isNaN(increment)) {
return '';
const stringValue = String(currentValue || '') + value;
setLocalVariable(name, stringValue);
return stringValue;
}
const newValue = Number(currentValue) + increment;
@ -56,7 +58,9 @@ function addGlobalVariable(name, value) {
const increment = Number(value);
if (isNaN(increment)) {
return '';
const stringValue = String(currentValue || '') + value;
setGlobalVariable(name, stringValue);
return stringValue;
}
const newValue = Number(currentValue) + increment;