Merge branch 'persona-improvements' of https://github.com/SillyTavern/SillyTavern into persona-improvements

9e7f485b650a18c5aea94c17698c1c9100b315bc

Wolfsblvt <wolfsblvt@gmail.com>

2 files changed, +21 -3Showing whitespace changes
public/scripts/personas.js+20 -2
@@ -1219,10 +1219,13 @@ function updatePersonaUIStates() {
1219 const { isTemporary, info } = getPersonaTemporaryLockInfo();1219 const { isTemporary, info } = getPersonaTemporaryLockInfo();
1220 if (isTemporary) {1220 if (isTemporary) {
1221 const messageContainer = document.createElement('div');1221 const messageContainer = document.createElement('div');
1222 messageContainer.innerHTML = t`Temporary persona in use.`;1222 const messageSpan = document.createElement('span');
1223 messageSpan.textContent = t`Temporary persona in use.`;
1224 messageContainer.appendChild(messageSpan);
1225 messageContainer.classList.add('flex-container', 'alignItemsBaseline');
12231226
1224 const infoIcon = document.createElement('i');1227 const infoIcon = document.createElement('i');
1225 infoIcon.classList.add('fa-solid', 'fa-circle-info', 'opacity50p', 'marginLeft5');1228 infoIcon.classList.add('fa-solid', 'fa-circle-info', 'opacity50p');
1226 infoIcon.title = info;1229 infoIcon.title = info;
1227 messageContainer.appendChild(infoIcon);1230 messageContainer.appendChild(infoIcon);
12281231
@@ -1525,7 +1528,22 @@ async function duplicatePersona(avatarId) {
1525 saveSettingsDebounced();1528 saveSettingsDebounced();
1526}1529}
15271530
1531/**
1532 * If a current user avatar is not bound to persona, bind it.
1533 */
1534function migrateNonPersonaUser() {
1535 if (user_avatar in power_user.personas) {
1536 return;
1537 }
1538
1539 power_user.personas[user_avatar] = name1;
1540 void getOrCreatePersonaDescriptor();
1541 setPersonaDescription();
1542 saveSettingsDebounced();
1543}
1544
1528export function initPersonas() {1545export function initPersonas() {
1546 migrateNonPersonaUser();
1529 $('#persona_delete_button').on('click', deleteUserAvatar);1547 $('#persona_delete_button').on('click', deleteUserAvatar);
1530 $('#lock_persona_default').on('click', () => togglePersonaLock('default'));1548 $('#lock_persona_default').on('click', () => togglePersonaLock('default'));
1531 $('#lock_user_name').on('click', () => togglePersonaLock('chat'));1549 $('#lock_user_name').on('click', () => togglePersonaLock('chat'));
public/style.css+1 -1
@@ -3028,7 +3028,7 @@ select option:not(:checked) {
3028 white-space: nowrap;3028 white-space: nowrap;
3029 margin-right: 10px;3029 margin-right: 10px;
3030 font-size: calc(var(--mainFontSize) * 1.25);3030 font-size: calc(var(--mainFontSize) * 1.25);
3031 color: var(--grey50);3031 opacity: 0.5;
3032}3032}
30333033
3034#persona_connections_buttons {3034#persona_connections_buttons {