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

ehm, once more, correctly.

Browse Source
This commit is contained in:
Juha Jeronen
2024-01-06 02:23:10 +02:00
parent d1e9c59e72
commit e6ade18b58
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -735,11 +735,12 @@ async function setSpriteSlashCommand(_, spriteId) {
} }
spriteId = spriteId.trim().toLowerCase(); spriteId = spriteId.trim().toLowerCase();
const currentLastMessage = getLastCharacterMessage();
const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage.name);
// In talkinghead mode, don't check for the existence of the sprite // In talkinghead mode, don't check for the existence of the sprite
// (emotion names are the same as for sprites, but it only needs "talkinghead.png"). // (emotion names are the same as for sprites, but it only needs "talkinghead.png").
const currentLastMessage = getLastCharacterMessage();
const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage.name);
let label = '';
if (extension_settings.expressions.local || !extension_settings.expressions.talkinghead) { if (extension_settings.expressions.local || !extension_settings.expressions.talkinghead) {
await validateImages(spriteFolderName); await validateImages(spriteFolderName);
@ -752,10 +753,15 @@ async function setSpriteSlashCommand(_, spriteId) {
console.log('No sprite found for search term ' + spriteId); console.log('No sprite found for search term ' + spriteId);
return; return;
} }
label = spriteItem.label;
}
else {
label = spriteId;
} }
const vnMode = isVisualNovelMode(); const vnMode = isVisualNovelMode();
await sendExpressionCall(spriteFolderName, spriteItem.label, true, vnMode); await sendExpressionCall(spriteFolderName, label, true, vnMode);
} }
/** /**