Fix temporary persona toast - Temporary persona toast was appearing when auto-lock was enabled, which didn't make sense

076e5e3186a61c277df2b349a588d6d7b03d31e9

Wolfsblvt <wolfsblvt@gmail.com>

Parents: e1bf781b10a77060d6eed13803be31afaea00db4
1 files changed, +13 -12Showing whitespace changes
public/scripts/personas.js+13 -12
@@ -684,18 +684,6 @@ async function bindUserNameToPersona(e) {
684function selectCurrentPersona() {684function selectCurrentPersona() {
685 const personaName = power_user.personas[user_avatar];685 const personaName = power_user.personas[user_avatar];
686 if (personaName) {686 if (personaName) {
687 const hasDifferentChatLock = chat_metadata['persona'] && chat_metadata['persona'] !== user_avatar;
688 const hasDifferentDefaultLock = power_user.default_persona && power_user.default_persona !== user_avatar;
689
690 if (hasDifferentChatLock || (!chat_metadata['persona'] && hasDifferentDefaultLock)) {
691 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.`
692 + '<br /><br />'
693 + t`Current Persona: ${power_user.personas[user_avatar]}`
694 + (hasDifferentChatLock ? '<br />' + t`Chat persona: ${power_user.personas[chat_metadata['persona']]}` : '')
695 + (hasDifferentDefaultLock ? '<br />' + t`Default persona: ${power_user.personas[power_user.default_persona]}` : '');
696 toastr.info(message, t`Temporary Persona`, { escapeHtml: false, timeOut: 10000, extendedTimeOut: 20000, preventDuplicates: true });
697 }
698
699 if (personaName !== name1) {687 if (personaName !== name1) {
700 console.log(`Auto-updating user name to ${personaName}`);688 console.log(`Auto-updating user name to ${personaName}`);
701 setUserName(personaName);689 setUserName(personaName);
@@ -736,6 +724,19 @@ function selectCurrentPersona() {
736 }724 }
737 saveMetadataDebounced();725 saveMetadataDebounced();
738 }726 }
727
728 // As the last step, inform user if the persona is only temporarily chosen
729 const hasDifferentChatLock = !!chat_metadata['persona'] && chat_metadata['persona'] !== user_avatar;
730 const hasDifferentDefaultLock = power_user.default_persona && power_user.default_persona !== user_avatar;
731
732 if (hasDifferentChatLock || (!chat_metadata['persona'] && hasDifferentDefaultLock)) {
733 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.`
734 + '<br /><br />'
735 + t`Current Persona: ${power_user.personas[user_avatar]}`
736 + (hasDifferentChatLock ? '<br />' + t`Chat persona: ${power_user.personas[chat_metadata['persona']]}` : '')
737 + (hasDifferentDefaultLock ? '<br />' + t`Default persona: ${power_user.personas[power_user.default_persona]}` : '');
738 toastr.info(message, t`Temporary Persona`, { escapeHtml: false, timeOut: 10000, extendedTimeOut: 20000, preventDuplicates: true });
739 }
739 }740 }
740}741}
741742