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

Substitute macro in character editor token counter

Browse Source
This commit is contained in:
Cohee
2023-10-21 14:39:01 +03:00
parent 6fe4232f75
commit 703965aec8
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/script.js
View File

@@ -1674,7 +1674,7 @@ function substituteParams(content, _name1, _name2, _original, _group) {
if (typeof _original === 'string') { if (typeof _original === 'string') {
content = content.replace(/{{original}}/i, _original); content = content.replace(/{{original}}/i, _original);
} }
content = content.replace(/{{input}}/gi, $('#send_textarea').val()); content = content.replace(/{{input}}/gi, String($('#send_textarea').val()));
content = content.replace(/{{user}}/gi, _name1); content = content.replace(/{{user}}/gi, _name1);
content = content.replace(/{{char}}/gi, _name2); content = content.replace(/{{char}}/gi, _name2);
content = content.replace(/{{charIfNotGroup}}/gi, _group); content = content.replace(/{{charIfNotGroup}}/gi, _group);

6
public/scripts/RossAscends-mods.js
View File

@@ -18,6 +18,8 @@ import {
getThumbnailUrl, getThumbnailUrl,
selectCharacterById, selectCharacterById,
eventSource, eventSource,
menu_type,
substituteParams,
} from "../script.js"; } from "../script.js";
import { import {
@@ -234,7 +236,9 @@ export function RA_CountCharTokens() {
total_tokens += Number(counter.text()); total_tokens += Number(counter.text());
permanent_tokens += isPermanent ? Number(counter.text()) : 0; permanent_tokens += isPermanent ? Number(counter.text()) : 0;
} else { } else {
const tokens = getTokenCount(value); // We substitute macro for existing characters, but not for the character being created
const valueToCount = menu_type === 'create' ? value : substituteParams(value);
const tokens = getTokenCount(valueToCount);
counter.text(tokens); counter.text(tokens);
total_tokens += tokens; total_tokens += tokens;
permanent_tokens += isPermanent ? tokens : 0; permanent_tokens += isPermanent ? tokens : 0;