Invert groupId check

58db8440abcb8671a9fcf674bdc037357d5bdefc

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

Parents: a08b3ec7fc63c5d4301a91d07717c53dce016c89
1 files changed, +9 -7Ignore whitespace
public/scripts/extensions/stable-diffusion/index.js+9 -7
@@ -2312,9 +2312,9 @@ async function generatePicture(initiator, args, trigger, message, callback) {
2312 const quietPrompt = getQuietPrompt(generationType, trigger);2312 const quietPrompt = getQuietPrompt(generationType, trigger);
2313 const context = getContext();2313 const context = getContext();
23142314
2315 // if context.characterId is not null, then we get context.characters[context.characterId].avatar, else we get groupId and context.groups[groupId].id2315 const characterName = context.groupId
2316 // sadly, groups is not an array, but is a dict with keys being index numbers, so we have to filter it2316 ? context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString()
2317 const characterName = context.characterId ? context.characters[context.characterId].name : context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString();2317 : context.characters[context.characterId]?.name;
23182318
2319 if (generationType == generationMode.BACKGROUND) {2319 if (generationType == generationMode.BACKGROUND) {
2320 const callbackOriginal = callback;2320 const callbackOriginal = callback;
@@ -3573,7 +3573,9 @@ async function sdMessageButton(e) {
3573 const $mes = $icon.closest('.mes');3573 const $mes = $icon.closest('.mes');
3574 const message_id = $mes.attr('mesid');3574 const message_id = $mes.attr('mesid');
3575 const message = context.chat[message_id];3575 const message = context.chat[message_id];
3576 const characterFileName = context.characterId ? context.characters[context.characterId].name : context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString();3576 const characterFileName = context.groupId
3577 ? context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString()
3578 : context.characters[context.characterId]?.name;
3577 const messageText = message?.mes;3579 const messageText = message?.mes;
3578 const hasSavedImage = message?.extra?.image && message?.extra?.title;3580 const hasSavedImage = message?.extra?.image && message?.extra?.title;
3579 const hasSavedNegative = message?.extra?.negative;3581 const hasSavedNegative = message?.extra?.negative;
@@ -3735,9 +3737,9 @@ async function onImageSwiped({ message, element, direction }) {
3735 const hasNegative = message.extra.negative;3737 const hasNegative = message.extra.negative;
3736 const prompt = await refinePrompt(message.extra.title, false, false);3738 const prompt = await refinePrompt(message.extra.title, false, false);
3737 const negativePromptPrefix = hasNegative ? await refinePrompt(message.extra.negative, false, true) : '';3739 const negativePromptPrefix = hasNegative ? await refinePrompt(message.extra.negative, false, true) : '';
3738 const characterName = context.characterId3740 const characterName = context.groupId
3739 ? context.characters[context.characterId].name3741 ? context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString()
3740 : context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString();3742 : context.characters[context.characterId]?.name;
37413743
3742 messageImg.addClass(animationClass);3744 messageImg.addClass(animationClass);
3743 swipeControls.hide();3745 swipeControls.hide();