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

Fix force set emote in group

Browse Source
This commit is contained in:
Cohee
2025-02-21 01:46:10 +02:00
parent e35217e7e3
commit bdbcf8623e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/scripts/extensions/expressions/index.js
View File

@ -234,6 +234,10 @@ async function visualNovelSetCharacterSprites(vnContainer, spriteFolderName, exp
setSpritePromises.push(fadeInPromise); setSpritePromises.push(fadeInPromise);
} }
if (!img) {
continue;
}
img.attr('data-sprite-folder-name', spriteFolderName); img.attr('data-sprite-folder-name', spriteFolderName);
img.attr('data-expression', expression); img.attr('data-expression', expression);
img.attr('data-sprite-filename', spriteFile?.fileName || null); img.attr('data-sprite-filename', spriteFile?.fileName || null);
@ -679,7 +683,8 @@ async function setSpriteSlashCommand({ type }, searchTerm) {
return ''; return '';
} }
const spriteFolderName = getSpriteFolderName(); const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
let label = searchTerm; let label = searchTerm;
@ -2135,7 +2140,8 @@ function migrateSettings() {
const localEnumProviders = { const localEnumProviders = {
expressions: () => { expressions: () => {
const spriteFolderName = getSpriteFolderName(); const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
const expressions = getCachedExpressions(); const expressions = getCachedExpressions();
return expressions.map(expression => { return expressions.map(expression => {
const spriteCount = spriteCache[spriteFolderName]?.find(x => x.label === expression)?.files.length ?? 0; const spriteCount = spriteCache[spriteFolderName]?.find(x => x.label === expression)?.files.length ?? 0;
@ -2149,7 +2155,8 @@ function migrateSettings() {
}); });
}, },
sprites: () => { sprites: () => {
const spriteFolderName = getSpriteFolderName(); const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
const sprites = spriteCache[spriteFolderName]?.map(x => x.files)?.flat() ?? []; const sprites = spriteCache[spriteFolderName]?.map(x => x.files)?.flat() ?? [];
return sprites.map(x => { return sprites.map(x => {
return new SlashCommandEnumValue(x.title, return new SlashCommandEnumValue(x.title,