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

move to env

Browse Source
This commit is contained in:
steve02081504
2024-05-12 09:01:30 +08:00
parent 78cf6e9086
commit 45a080016e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/script.js
View File

@ -2311,6 +2311,7 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re
environment.char = _name2 ?? name2; environment.char = _name2 ?? name2;
environment.group = environment.charIfNotGroup = getGroupValue(); environment.group = environment.charIfNotGroup = getGroupValue();
environment.model = getGeneratingModel(); environment.model = getGeneratingModel();
environment.char_version = characters.filter(x => x.name === environment.char).map(x => x.data.character_version)[0];
return evaluateMacros(content, environment); return evaluateMacros(content, environment);
} }

4
public/scripts/macros.js
View File

@ -337,8 +337,8 @@ export function evaluateMacros(content, env) {
content = content.replace(/{{isotime}}/gi, () => moment().format('HH:mm')); content = content.replace(/{{isotime}}/gi, () => moment().format('HH:mm'));
content = content.replace(/{{isodate}}/gi, () => moment().format('YYYY-MM-DD')); content = content.replace(/{{isodate}}/gi, () => moment().format('YYYY-MM-DD'));
content = content.replace(/{{char_version}}/gi, characters[this_chid]?.data?.character_version); content = content.replace(/{{char_version}}/gi, env.char_version);
content = content.replace(/{{char_version_url_encoded}}/gi, encodeURIComponent(characters[this_chid]?.data?.character_version)); content = content.replace(/{{char_version_url_encoded}}/gi, encodeURIComponent(env.char_version));
content = content.replace(/{{datetimeformat +([^}]*)}}/gi, (_, format) => { content = content.replace(/{{datetimeformat +([^}]*)}}/gi, (_, format) => {
const formattedTime = moment().format(format); const formattedTime = moment().format(format);