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 pull request #3205 from SillyTavern/forbid-empty-varnames

Browse Source 
Do not allow empty or undefined variable names.
This commit is contained in:
Cohee
2024-12-19 19:16:20 +02:00
committed by GitHub
parent 503c3ad22b d5ed0f6cdf
commit f3c12fb926
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/scripts/macros.js
View File

@@ -516,7 +516,11 @@ export function evaluateMacros(content, env, postProcessFn) {
break; break;
} }
content = content.replace(macro.regex, (...args) => postProcessFn(macro.replace(...args))); try {
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;

8
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 = {};
} }
@@ -99,6 +103,10 @@ function getGlobalVariable(name, args = {}) {
} }
function setGlobalVariable(name, value, args = {}) { function setGlobalVariable(name, value, args = {}) {
if (!name) {
throw new Error('Variable name cannot be empty or undefined.');
}
if (args.index !== undefined) { if (args.index !== undefined) {
try { try {
let globalVariable = JSON.parse(extension_settings.variables.global[name] ?? 'null'); let globalVariable = JSON.parse(extension_settings.variables.global[name] ?? 'null');