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

Disallow multiple {{original}} macro substitutions

Browse Source
This commit is contained in:
Cohee
2024-01-29 00:58:29 +02:00
parent a9464daffa
commit 5f1e290bda
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/scripts/macros.js
View File

@ -221,8 +221,7 @@ export function evaluateMacros(content, env) {
if (!Object.hasOwn(env, varName)) continue;
const param = env[varName];
const paramValue = typeof param === 'function' ? param() : param;
content = content.replace(new RegExp(`{{${varName}}}`, 'gi'), paramValue);
content = content.replace(new RegExp(`{{${varName}}}`, 'gi'), param);
}
content = content.replace(/{{maxPrompt}}/gi, () => String(getMaxContextSize()));