Pakobbix/rpg-companion-sillytavern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #75 from munimunigamer/avatar-gen-fixes

Browse Source 
fixed right click regen and clearing chat
This commit is contained in:
Spicy Marinara
2025-12-27 21:32:53 +01:00
committed by GitHub
parent 3caa74fbf8 10f6326f82
commit 09463fc95a
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.js
+3
View File
@@ -537,6 +537,9 @@ async function initUI() {
} else { } else {
$options.slideUp(200); $options.slideUp(200);
} }
// Re-render thoughts to update tooltips (regenerate vs delete)
renderThoughts();
}); });
$('#rpg-avatar-llm-instruction').on('input', function() { $('#rpg-avatar-llm-instruction').on('input', function() {
src/systems/features/avatarGenerator.js
+1 -1
View File
@@ -324,7 +324,7 @@ async function generateSingleAvatar(characterName) {
// Execute /sd command with quiet=true to suppress chat output // Execute /sd command with quiet=true to suppress chat output
const result = await executeSlashCommandsOnChatInput( const result = await executeSlashCommandsOnChatInput(
`/sd quiet=true ${prompt}`, `/sd quiet=true ${prompt}`,
{ clearChatInput: true } { clearChatInput: false }
); );
// Extract image URL from result // Extract image URL from result
src/systems/rendering/thoughts.js
+12 -2
View File
@@ -473,10 +473,15 @@ export function renderThoughts() {
const escapedDefaultName = escapeHtmlAttr(defaultName); const escapedDefaultName = escapeHtmlAttr(defaultName);
// Determine right-click action text based on auto-generate setting
const defaultAvatarRightClickAction = extensionSettings.autoGenerateAvatars
? 'Right-click to regenerate avatar'
: 'Right-click to delete avatar';
html += '<div class="rpg-thoughts-content">'; html += '<div class="rpg-thoughts-content">';
html += ` html += `
<div class="rpg-character-card" data-character-name="${escapedDefaultName}"> <div class="rpg-character-card" data-character-name="${escapedDefaultName}">
<div class="rpg-character-avatar rpg-avatar-upload" data-character="${escapedDefaultName}" title="Click to upload custom avatar&#10;Right-click to regenerate avatar"> <div class="rpg-character-avatar rpg-avatar-upload" data-character="${escapedDefaultName}" title="Click to upload custom avatar&#10;${defaultAvatarRightClickAction}">
<img src="${defaultPortrait}" alt="${escapedDefaultName}" onerror="this.style.opacity='0.5';this.onerror=null;" /> <img src="${defaultPortrait}" alt="${escapedDefaultName}" onerror="this.style.opacity='0.5';this.onerror=null;" />
<div class="rpg-relationship-badge rpg-editable" contenteditable="true" data-character="${escapedDefaultName}" data-field="relationship" title="Click to edit (use emoji: ⚔️ ⚖️ ⭐ ❤️)">⚖️</div> <div class="rpg-relationship-badge rpg-editable" contenteditable="true" data-character="${escapedDefaultName}" data-field="relationship" title="Click to edit (use emoji: ⚔️ ⚖️ ⭐ ❤️)">⚖️</div>
</div> </div>
@@ -535,9 +540,14 @@ export function renderThoughts() {
// Check if avatar is being generated // Check if avatar is being generated
const isCurrentlyGenerating = isGenerating(char.name); const isCurrentlyGenerating = isGenerating(char.name);
// Determine right-click action text based on auto-generate setting
const avatarRightClickAction = extensionSettings.autoGenerateAvatars
? 'Right-click to regenerate avatar'
: 'Right-click to delete avatar';
html += ` html += `
<div class="rpg-character-card" data-character-name="${escapedName}"> <div class="rpg-character-card" data-character-name="${escapedName}">
<div class="rpg-character-avatar rpg-avatar-upload ${isCurrentlyGenerating ? 'rpg-avatar-generating' : ''}" data-character="${escapedName}" title="Click to upload custom avatar&#10;Right-click to regenerate avatar"> <div class="rpg-character-avatar rpg-avatar-upload ${isCurrentlyGenerating ? 'rpg-avatar-generating' : ''}" data-character="${escapedName}" title="Click to upload custom avatar&#10;${avatarRightClickAction}">
<img src="${characterPortrait}" alt="${escapedName}" onerror="this.style.opacity='0.5';this.onerror=null;" /> <img src="${characterPortrait}" alt="${escapedName}" onerror="this.style.opacity='0.5';this.onerror=null;" />
${isCurrentlyGenerating ? '<div class="rpg-generating-overlay"><i class="fa-solid fa-spinner fa-spin"></i></div>' : ''} ${isCurrentlyGenerating ? '<div class="rpg-generating-overlay"><i class="fa-solid fa-spinner fa-spin"></i></div>' : ''}
${hasRelationshipEnabled ? `<div class="rpg-relationship-badge rpg-editable" contenteditable="true" data-character="${escapedName}" data-field="${relationshipFieldName}" title="Click to edit (use emoji: ⚔️ ⚖️ ⭐ ❤️)">${relationshipBadge}</div>` : ''} ${hasRelationshipEnabled ? `<div class="rpg-relationship-badge rpg-editable" contenteditable="true" data-character="${escapedName}" data-field="${relationshipFieldName}" title="Click to edit (use emoji: ⚔️ ⚖️ ⭐ ❤️)">${relationshipBadge}</div>` : ''}