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

Add {{groupNotMuted}}

Browse Source
This commit is contained in:
Cohee
2024-12-05 22:57:02 +02:00
parent f5f60e269e
commit 3502bfcaa0
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/script.js
View File

@ -2607,15 +2607,18 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re
};
}
const getGroupValue = () => {
const getGroupValue = (includeMuted) => {
if (typeof _group === 'string') {
return _group;
}
if (selected_group) {
const members = groups.find(x => x.id === selected_group)?.members;
/** @type {string[]} */
const disabledMembers = groups.find(x => x.id === selected_group)?.disabled_members ?? [];
const isMuted = x => includeMuted ? true : !disabledMembers.includes(x);
const names = Array.isArray(members)
? members.map(m => characters.find(c => c.avatar === m)?.name).filter(Boolean).join(', ')
? members.filter(isMuted).map(m => characters.find(c => c.avatar === m)?.name).filter(Boolean).join(', ')
: '';
return names;
} else {
@ -2639,7 +2642,8 @@ export function substituteParams(content, _name1, _name2, _original, _group, _re
// Must be substituted last so that they're replaced inside {{description}}
environment.user = _name1 ?? name1;
environment.char = _name2 ?? name2;
environment.group = environment.charIfNotGroup = getGroupValue();
environment.group = environment.charIfNotGroup = getGroupValue(true);
environment.groupNotMuted = getGroupValue(false);
environment.model = getGeneratingModel();
if (additionalMacro && typeof additionalMacro === 'object') {