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

Do not allow empty or undefined variable names.

Browse Source 
Closes #3204
This commit is contained in:
Cohee
2024-12-18 20:22:27 +02:00
parent 00363cc206
commit 372ac26080
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/scripts/macros.js
View File

@ -516,7 +516,11 @@ export function evaluateMacros(content, env, postProcessFn) {
break; break;
} }
try {
content = content.replace(macro.regex, (...args) => postProcessFn(macro.replace(...args))); content = content.replace(macro.regex, (...args) => postProcessFn(macro.replace(...args)));
} catch (e) {
console.warn(`Macro content can't be replaced: ${macro.regex} in ${content}`, e);
}
} }
return content; return content;

4
public/scripts/variables.js
View File

@ -46,6 +46,10 @@ function getLocalVariable(name, args = {}) {
} }
function setLocalVariable(name, value, args = {}) { function setLocalVariable(name, value, args = {}) {
if (!name) {
throw new Error('Variable name cannot be empty or undefined.');
}
if (!chat_metadata.variables) { if (!chat_metadata.variables) {
chat_metadata.variables = {}; chat_metadata.variables = {};
} }