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

Invert groupId check

Browse Source
This commit is contained in:
Cohee
2024-08-15 00:49:50 +03:00
parent a08b3ec7fc
commit 58db8440ab
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/scripts/extensions/stable-diffusion/index.js
View File

@ -2312,9 +2312,9 @@ async function generatePicture(initiator, args, trigger, message, callback) {
const quietPrompt = getQuietPrompt(generationType, trigger); const quietPrompt = getQuietPrompt(generationType, trigger);
const context = getContext(); const context = getContext();
// if context.characterId is not null, then we get context.characters[context.characterId].avatar, else we get groupId and context.groups[groupId].id const characterName = context.groupId
// sadly, groups is not an array, but is a dict with keys being index numbers, so we have to filter it ? context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString()
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(); : context.characters[context.characterId]?.name;
if (generationType == generationMode.BACKGROUND) { if (generationType == generationMode.BACKGROUND) {
const callbackOriginal = callback; const callbackOriginal = callback;
@ -3573,7 +3573,9 @@ async function sdMessageButton(e) {
const $mes = $icon.closest('.mes'); const $mes = $icon.closest('.mes');
const message_id = $mes.attr('mesid'); const message_id = $mes.attr('mesid');
const message = context.chat[message_id]; const message = context.chat[message_id];
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(); const characterFileName = context.groupId
? context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString()
: context.characters[context.characterId]?.name;
const messageText = message?.mes; const messageText = message?.mes;
const hasSavedImage = message?.extra?.image && message?.extra?.title; const hasSavedImage = message?.extra?.image && message?.extra?.title;
const hasSavedNegative = message?.extra?.negative; const hasSavedNegative = message?.extra?.negative;
@ -3735,9 +3737,9 @@ async function onImageSwiped({ message, element, direction }) {
const hasNegative = message.extra.negative; const hasNegative = message.extra.negative;
const prompt = await refinePrompt(message.extra.title, false, false); const prompt = await refinePrompt(message.extra.title, false, false);
const negativePromptPrefix = hasNegative ? await refinePrompt(message.extra.negative, false, true) : ''; const negativePromptPrefix = hasNegative ? await refinePrompt(message.extra.negative, false, true) : '';
const characterName = context.characterId const characterName = context.groupId
? context.characters[context.characterId].name ? context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString()
: context.groups[Object.keys(context.groups).filter(x => context.groups[x].id === context.groupId)[0]]?.id?.toString(); : context.characters[context.characterId]?.name;
messageImg.addClass(animationClass); messageImg.addClass(animationClass);
swipeControls.hide(); swipeControls.hide();