rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-12 10:00:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2826 from SillyTavern/fix-ask

Browse Source 
Fix restoration of current character after /ask
This commit is contained in:
Cohee 2024-09-11 22:51:28 +03:00 committed by GitHub
commit ac03cbb0ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/scripts/slash-commands.js
View File

@ -2533,22 +2533,23 @@ async function askCharacter(args, text) {
lastMessage.force_avatar = force_avatar; lastMessage.force_avatar = force_avatar;
lastMessage.original_avatar = original_avatar; lastMessage.original_avatar = original_avatar;
} }
// Kill this callback once the event fires
eventSource.removeListener(event_types.CHARACTER_MESSAGE_RENDERED, restoreCharacter);
}; };
// Run generate and restore previous character on error // Run generate and restore previous character
try { try {
toastr.info(`Asking ${character.name} something...`); toastr.info(`Asking ${character.name} something...`);
await Generate('ask_command'); await Generate('ask_command');
} catch { await saveChatConditional();
} catch (error) {
console.error('Error running /ask command', error);
} finally {
restoreCharacter(); restoreCharacter();
if (this_chid !== prevChId) {
toastr.error('It is strongly recommended to reload the page.', 'Something went wrong');
}
} }
// Restore previous character once message renders
// Hack for generate
eventSource.on(event_types.CHARACTER_MESSAGE_RENDERED, restoreCharacter);
return ''; return '';
} }