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) {
23122312 const quietPrompt = getQuietPrompt(generationType, trigger);
23132313 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].id
2315+ 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 it
2316+ ? 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
23192319 if (generationType == generationMode.BACKGROUND) {
23202320 const callbackOriginal = callback;
@@ -3573,7 +3573,9 @@ async function sdMessageButton(e) {
35733573 const $mes = $icon.closest('.mes');
35743574 const message_id = $mes.attr('mesid');
35753575 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;
35773579 const messageText = message?.mes;
35783580 const hasSavedImage = message?.extra?.image && message?.extra?.title;
35793581 const hasSavedNegative = message?.extra?.negative;
@@ -3735,9 +3737,9 @@ async function onImageSwiped({ message, element, direction }) {
37353737 const hasNegative = message.extra.negative;
37363738 const prompt = await refinePrompt(message.extra.title, false, false);
37373739 const negativePromptPrefix = hasNegative ? await refinePrompt(message.extra.negative, false, true) : '';
37383740 const characterName = context.characterIdgroupId
3739- ? context.characters[context.characterId].name
3741+ ? 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
37423744 messageImg.addClass(animationClass);
37433745 swipeControls.hide();