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

fix scope for closure arguments

Browse Source
This commit is contained in:
LenAnderson
2024-04-02 09:47:06 -04:00
parent e0e89959b9
commit 965b996dab
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,12 +18,13 @@ export class SlashCommandClosure {
this.scope = new SlashCommandScope(parent); this.scope = new SlashCommandScope(parent);
} }
substituteParams(text) { substituteParams(text, scope = null) {
scope = scope ?? this.scope;
text = substituteParams(text) text = substituteParams(text)
.replace(/{{pipe}}/g, this.scope.pipe) .replace(/{{pipe}}/g, scope.pipe)
.replace(/{{var::(\w+?)}}/g, (_, key)=>this.scope.getVariable(key)) .replace(/{{var::(\w+?)}}/g, (_, key)=>scope.getVariable(key))
; ;
for (const { key, value } of this.scope.macroList) { for (const { key, value } of scope.macroList) {
text = text.replace(new RegExp(`{{${key}}}`), value); text = text.replace(new RegExp(`{{${key}}}`), value);
} }
return text; return text;
@ -89,7 +90,7 @@ export class SlashCommandClosure {
v = closure; v = closure;
} }
} else { } else {
v = this.substituteParams(v); v = this.substituteParams(v, this.scope.parent);
} }
// unescape value // unescape value
if (typeof v == 'string') { if (typeof v == 'string') {