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 parser-followup-2

Browse Source
This commit is contained in:
LenAnderson
2024-06-24 07:29:37 -04:00
parent 3a60b45253 e7ab43527a
commit e0f6819261
6 changed files with 724 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1941,8 +1941,8 @@ async function generateCallback(args, value) {
}
async function echoCallback(args, value) {
const safeValue = DOMPurify.sanitize(String(value) || '');
if (safeValue === '') {
// Note: We don't need to sanitize input, as toastr is set up by default to escape HTML via toastr options
if (value === '') {
console.warn('WARN: No argument provided for /echo command');
return;
}
@ -1950,17 +1950,17 @@ async function echoCallback(args, value) {
const severity = args?.severity !== undefined && typeof args?.severity === 'string' ? args.severity : 'info';
switch (severity) {
case 'error':
toastr.error(safeValue, title);
toastr.error(value, title);
break;
case 'warning':
toastr.warning(safeValue, title);
toastr.warning(value, title);
break;
case 'success':
toastr.success(safeValue, title);
toastr.success(value, title);
break;
case 'info':
default:
toastr.info(safeValue, title);
toastr.info(value, title);
break;
}
return value;