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

Fix temporary persona toast

Browse Source 
- Temporary persona toast was appearing when auto-lock was enabled, which didn't make sense
This commit is contained in:
Wolfsblvt
2025-01-25 18:23:00 +01:00
parent e1bf781b10
commit 076e5e3186
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
public/scripts/personas.js
View File

@@ -684,18 +684,6 @@ async function bindUserNameToPersona(e) {
function selectCurrentPersona() { function selectCurrentPersona() {
const personaName = power_user.personas[user_avatar]; const personaName = power_user.personas[user_avatar];
if (personaName) { if (personaName) {
const hasDifferentChatLock = chat_metadata['persona'] && chat_metadata['persona'] !== user_avatar;
const hasDifferentDefaultLock = power_user.default_persona && power_user.default_persona !== user_avatar;
if (hasDifferentChatLock || (!chat_metadata['persona'] && hasDifferentDefaultLock)) {
const message = t`A different persona is locked to this chat, or you have a different default persona set. The currently selected persona will only be temporary, and resets on reload. Consider locking this persona to the chat if you want to permanently use it.`
+ '<br /><br />'
+ t`Current Persona: ${power_user.personas[user_avatar]}`
+ (hasDifferentChatLock ? '<br />' + t`Chat persona: ${power_user.personas[chat_metadata['persona']]}` : '')
+ (hasDifferentDefaultLock ? '<br />' + t`Default persona: ${power_user.personas[power_user.default_persona]}` : '');
toastr.info(message, t`Temporary Persona`, { escapeHtml: false, timeOut: 10000, extendedTimeOut: 20000, preventDuplicates: true });
}
if (personaName !== name1) { if (personaName !== name1) {
console.log(`Auto-updating user name to ${personaName}`); console.log(`Auto-updating user name to ${personaName}`);
setUserName(personaName); setUserName(personaName);
@@ -736,6 +724,19 @@ function selectCurrentPersona() {
} }
saveMetadataDebounced(); saveMetadataDebounced();
} }
// As the last step, inform user if the persona is only temporarily chosen
const hasDifferentChatLock = !!chat_metadata['persona'] && chat_metadata['persona'] !== user_avatar;
const hasDifferentDefaultLock = power_user.default_persona && power_user.default_persona !== user_avatar;
if (hasDifferentChatLock || (!chat_metadata['persona'] && hasDifferentDefaultLock)) {
const message = t`A different persona is locked to this chat, or you have a different default persona set. The currently selected persona will only be temporary, and resets on reload. Consider locking this persona to the chat if you want to permanently use it.`
+ '<br /><br />'
+ t`Current Persona: ${power_user.personas[user_avatar]}`
+ (hasDifferentChatLock ? '<br />' + t`Chat persona: ${power_user.personas[chat_metadata['persona']]}` : '')
+ (hasDifferentDefaultLock ? '<br />' + t`Default persona: ${power_user.personas[power_user.default_persona]}` : '');
toastr.info(message, t`Temporary Persona`, { escapeHtml: false, timeOut: 10000, extendedTimeOut: 20000, preventDuplicates: true });
}
} }
} }