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

restore old escape handling and parser flag for strict escaping

Browse Source
This commit is contained in:
LenAnderson
2024-04-20 07:08:53 -04:00
parent 1de09bf71d
commit bc6ff9756a
5 changed files with 93 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/scripts/variables.js
View File

@ -320,7 +320,7 @@ async function whileCallback(args, command) {
if (result && command) {
if (command instanceof SlashCommandClosure) await command.execute();
else await executeSubCommands(command, args._scope);
else await executeSubCommands(command, args._scope, args._parserFlags);
} else {
break;
}
@ -346,7 +346,7 @@ async function timesCallback(args, value) {
await command.execute();
}
else {
await executeSubCommands(command.replace(/\{\{timesIndex\}\}/g, i), args._scope);
await executeSubCommands(command.replace(/\{\{timesIndex\}\}/g, i), args._scope, args._parserFlags);
}
}
@ -359,10 +359,10 @@ async function ifCallback(args, command) {
if (result && command) {
if (command instanceof SlashCommandClosure) return (await command.execute()).pipe;
return await executeSubCommands(command, args._scope);
return await executeSubCommands(command, args._scope, args._parserFlags);
} else if (!result && args.else && ((typeof args.else === 'string' && args.else !== '') || args.else instanceof SlashCommandClosure)) {
if (args.else instanceof SlashCommandClosure) return (await args.else.execute(args._scope)).pipe;
return await executeSubCommands(args.else, args._scope);
return await executeSubCommands(args.else, args._scope, args._parserFlags);
}
return '';
@ -509,12 +509,12 @@ function evalBoolean(rule, a, b) {
* @param {string} command Command to execute. May contain escaped macro and batch separators.
* @returns {Promise<string>} Pipe result
*/
async function executeSubCommands(command, scope = null) {
async function executeSubCommands(command, scope = null, parserFlags = null) {
if (command.startsWith('"') && command.endsWith('"')) {
command = command.slice(1, -1);
}
const result = await executeSlashCommands(command, true, scope);
const result = await executeSlashCommands(command, true, scope, true, parserFlags);
if (!result || typeof result !== 'object') {
return '';