Fix force set emote in group

bdbcf8623e7b6671a14f1a41e0216632cb39cf21

Cohee <18619528+Cohee1207@users.noreply.github.com>

1 files changed, +10 -3Ignore whitespace
public/scripts/extensions/expressions/index.js+10 -3
@@ -234,6 +234,10 @@ async function visualNovelSetCharacterSprites(vnContainer, spriteFolderName, exp
234234 setSpritePromises.push(fadeInPromise);
235235 }
236236
237+ if (!img) {
238+ continue;
239+ }
240+
237241 img.attr('data-sprite-folder-name', spriteFolderName);
238242 img.attr('data-expression', expression);
239243 img.attr('data-sprite-filename', spriteFile?.fileName || null);
@@ -679,7 +683,8 @@ async function setSpriteSlashCommand({ type }, searchTerm) {
679683 return '';
680684 }
681685
682686 const spriteFolderNamecurrentLastMessage = getSpriteFolderNameselected_group ? getLastCharacterMessage() : null;
687+ const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
683688
684689 let label = searchTerm;
685690
@@ -2135,7 +2140,8 @@ function migrateSettings() {
21352140
21362141 const localEnumProviders = {
21372142 expressions: () => {
21382143 const spriteFolderNamecurrentLastMessage = getSpriteFolderNameselected_group ? getLastCharacterMessage() : null;
2144+ const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
21392145 const expressions = getCachedExpressions();
21402146 return expressions.map(expression => {
21412147 const spriteCount = spriteCache[spriteFolderName]?.find(x => x.label === expression)?.files.length ?? 0;
@@ -2149,7 +2155,8 @@ function migrateSettings() {
21492155 });
21502156 },
21512157 sprites: () => {
21522158 const spriteFolderNamecurrentLastMessage = getSpriteFolderNameselected_group ? getLastCharacterMessage() : null;
2159+ const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
21532160 const sprites = spriteCache[spriteFolderName]?.map(x => x.files)?.flat() ?? [];
21542161 return sprites.map(x => {
21552162 return new SlashCommandEnumValue(x.title,