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

Don't replace {{addvar}} macros with the execution result

This commit is contained in:
Cohee 2023-11-25 20:33:07 +02:00
parent 67fa9c9595
commit 0d9068f11e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/variables.js
View File

@ -102,7 +102,8 @@ export function replaceVariableMacros(str) {
// Replace {{addvar::name::value}} with empty string and add value to the variable value // Replace {{addvar::name::value}} with empty string and add value to the variable value
str = str.replace(/{{addvar::([^:]+)::([^}]+)}}/gi, (_, name, value) => { str = str.replace(/{{addvar::([^:]+)::([^}]+)}}/gi, (_, name, value) => {
name = name.trim(); name = name.trim();
return addLocalVariable(name, value);; addLocalVariable(name, value);;
return '';
}); });
// Replace {{getglobalvar::name}} with the value of the global variable name // Replace {{getglobalvar::name}} with the value of the global variable name
@ -121,7 +122,8 @@ export function replaceVariableMacros(str) {
// Replace {{addglobalvar::name::value}} with empty string and add value to the global variable value // Replace {{addglobalvar::name::value}} with empty string and add value to the global variable value
str = str.replace(/{{addglobalvar::([^:]+)::([^}]+)}}/gi, (_, name, value) => { str = str.replace(/{{addglobalvar::([^:]+)::([^}]+)}}/gi, (_, name, value) => {
name = name.trim(); name = name.trim();
return addGlobalVariable(name, value); addGlobalVariable(name, value);
return '';
}); });
return str; return str;