Refactor: move showCharConnections

bb03c60c3935b18b7b57a5b5cb71d669078325e3

Wolfsblvt <wolfsblvt@gmail.com>

Parents: 8f38298f903cc4ec8f4f3eb22f78ba9c781369d5

public/script.js+0 -46 Viewed

     setPersonaDescription,
     initUserAvatar,
     updatePersonaConnectionsAvatarList,
-    getConnectedPersonas,
-    askForPersonaSelection,
-    getCurrentConnectionObj,
     isPersonaPanelOpen,
 } from './scripts/personas.js';
 import { getBackgrounds, initBackgrounds, loadBackgroundSettings, background_settings } from './scripts/backgrounds.js';

+        }
     });
-    $('#char_connections_button').on('click', async () => {
-        let isRemoving = false;
-        const connections = getConnectedPersonas();
-        const message = t`The following personas are connected to the current character.\n\nClick on a persona to select it for the current character.\nShift + Click to unlink the persona from the character.`;
-        const selectedPersona = await askForPersonaSelection(t`Persona Connections`, message, connections, {
-            okButton: t`Ok`,
-            highlightPersonas: true,
-            targetedChar: getCurrentConnectionObj(),
-            shiftClickHandler: (element, ev) => {
-                const personaId = $(element).attr('data-pid');
-                /** @type {import('./scripts/personas.js').PersonaConnection[]} */
-                const connections = power_user.persona_descriptions[personaId]?.connections;
-                if (connections) {
-                    console.log(`Unlocking persona ${personaId} from current character ${name2}`);
-                    power_user.persona_descriptions[personaId].connections = connections.filter(c => {
-                        if (menu_type == 'group_edit' && c.type == 'group' && c.id == selected_group) return false;
-                        else if (c.type == 'character' && c.id == characters[this_chid]?.avatar) return false;
-                        return true;
-                    });
-                    saveSettingsDebounced();
-                    updatePersonaConnectionsAvatarList();
-                    if (power_user.persona_show_notifications) {
-                        toastr.info(t`User persona ${power_user.personas[personaId]} is now unlocked from the current character ${name2}.`, t`Persona unlocked`);
-                    }
-                    isRemoving = true;
-                    $('#char_connections_button').trigger('click');
-                }
-            },
-        });
-        // One of the persona was selected. So load it.
-        if (!isRemoving && selectedPersona) {
-            setUserAvatar(selectedPersona, { toastPersonaNameChange: false });
-            if (power_user.persona_show_notifications) {
-                toastr.success(t`Selected persona ${power_user.personas[selectedPersona]} for current chat.`, t`Connected Persona Selected`);
-            }
-        }
-    });
     $('#character_cross').click(function () {
         is_advanced_char_open = false;
         $('#character_popup').transition({

public/scripts/personas.js+54 -0 Viewed

     getRequestHeaders,
     getThumbnailUrl,
     groupToEntity,
+    menu_type,
     name1,
     name2,
     reloadCurrentChat,

     return connectedPersonas;
+}
+/**
+ * Shows a popup with all personas connected to the currently selected character or group.
+ * In the popup, the user can select a persona to load for the current character or group, or shift-click to remove the connection.
+ * @return {Promise<void>}
+ */
+export async function showCharConnections() {
+    let isRemoving = false;
+    const connections = getConnectedPersonas();
+    const message = t`The following personas are connected to the current character.\n\nClick on a persona to select it for the current character.\nShift + Click to unlink the persona from the character.`;
+    const selectedPersona = await askForPersonaSelection(t`Persona Connections`, message, connections, {
+        okButton: t`Ok`,
+        highlightPersonas: true,
+        targetedChar: getCurrentConnectionObj(),
+        shiftClickHandler: (element, ev) => {
+            const personaId = $(element).attr('data-pid');
+            /** @type {PersonaConnection[]} */
+            const connections = power_user.persona_descriptions[personaId]?.connections;
+            if (connections) {
+                console.log(`Unlocking persona ${personaId} from current character ${name2}`);
+                power_user.persona_descriptions[personaId].connections = connections.filter(c => {
+                    if (menu_type == 'group_edit' && c.type == 'group' && c.id == selected_group) return false;
+                    else if (c.type == 'character' && c.id == characters[this_chid]?.avatar) return false;
+                    return true;
+                });
+                saveSettingsDebounced();
+                updatePersonaConnectionsAvatarList();
+                if (power_user.persona_show_notifications) {
+                    toastr.info(t`User persona ${power_user.personas[personaId]} is now unlocked from the current character ${name2}.`, t`Persona unlocked`);
+                }
+                isRemoving = true;
+                $('#char_connections_button').trigger('click');
+            }
+        },
+    });
+    // One of the persona was selected. So load it.
+    if (!isRemoving && selectedPersona) {
+        setUserAvatar(selectedPersona, { toastPersonaNameChange: false });
+        if (power_user.persona_show_notifications) {
+            toastr.success(t`Selected persona ${power_user.personas[selectedPersona]} for current chat.`, t`Connected Persona Selected`);
+        }
+    }
+}
 /**
  * Retrieves the current connection object based on whether the current chat is with a char or a group.
+ *

     saveSettingsDebounced();
+}
 export function initPersonas() {
     migrateNonPersonaUser();
     $('#persona_delete_button').on('click', deleteUserAvatar);

         $('#avatar_upload_file').trigger('click');
     });
+    $('#char_connections_button').on('click', showCharConnections);
     eventSource.on('charManagementDropdown', (target) => {
         if (target === 'convert_to_persona') {
             convertCharacterToPersona();

@@ -1617,3 +1670,4 @@ export function initPersonas() {
1617	eventSource.on(event_types.CHAT_CHANGED, loadPersonaForCurrentChat);	1670	eventSource.on(event_types.CHAT_CHANGED, loadPersonaForCurrentChat);
1618	switchPersonaGridView();	1671	switchPersonaGridView();
1619	}	1672	}
		1673