Fix force set emote in group

bdbcf8623e7b6671a14f1a41e0216632cb39cf21

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

Parents: e35217e7e3f66205957fe54443fb244dbf24f5b7
1 files changed, +10 -3Ignore whitespace
public/scripts/extensions/expressions/index.js+10 -3
@@ -234,6 +234,10 @@ async function visualNovelSetCharacterSprites(vnContainer, spriteFolderName, exp
234 setSpritePromises.push(fadeInPromise);234 setSpritePromises.push(fadeInPromise);
235 }235 }
236236
237 if (!img) {
238 continue;
239 }
240
237 img.attr('data-sprite-folder-name', spriteFolderName);241 img.attr('data-sprite-folder-name', spriteFolderName);
238 img.attr('data-expression', expression);242 img.attr('data-expression', expression);
239 img.attr('data-sprite-filename', spriteFile?.fileName || null);243 img.attr('data-sprite-filename', spriteFile?.fileName || null);
@@ -679,7 +683,8 @@ async function setSpriteSlashCommand({ type }, searchTerm) {
679 return '';683 return '';
680 }684 }
681685
682 const spriteFolderName = getSpriteFolderName();686 const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
687 const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
683688
684 let label = searchTerm;689 let label = searchTerm;
685690
@@ -2135,7 +2140,8 @@ function migrateSettings() {
21352140
2136 const localEnumProviders = {2141 const localEnumProviders = {
2137 expressions: () => {2142 expressions: () => {
2138 const spriteFolderName = getSpriteFolderName();2143 const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
2144 const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
2139 const expressions = getCachedExpressions();2145 const expressions = getCachedExpressions();
2140 return expressions.map(expression => {2146 return expressions.map(expression => {
2141 const spriteCount = spriteCache[spriteFolderName]?.find(x => x.label === expression)?.files.length ?? 0;2147 const spriteCount = spriteCache[spriteFolderName]?.find(x => x.label === expression)?.files.length ?? 0;
@@ -2149,7 +2155,8 @@ function migrateSettings() {
2149 });2155 });
2150 },2156 },
2151 sprites: () => {2157 sprites: () => {
2152 const spriteFolderName = getSpriteFolderName();2158 const currentLastMessage = selected_group ? getLastCharacterMessage() : null;
2159 const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name);
2153 const sprites = spriteCache[spriteFolderName]?.map(x => x.files)?.flat() ?? [];2160 const sprites = spriteCache[spriteFolderName]?.map(x => x.files)?.flat() ?? [];
2154 return sprites.map(x => {2161 return sprites.map(x => {
2155 return new SlashCommandEnumValue(x.title,2162 return new SlashCommandEnumValue(x.title,