Fix corruption due to this_chid shift (#3669) * continue works same as swipe continued message isn't depth counted * correct early-out check * update regex depth setting tooltips for accuracy * update max tooltip * remove redundant check * Fix corruption due to this_chid shift Fixes #3667 * Unshallow current character on reload * Allow -1 as a min depth value * Use selectCharacterById, fix rename logic * Remove pointless local variables * Add 'switchMenu' param to selectCharacterById --------- Co-authored-by: Reithan <bo122081@hotmail.com>

8ec83fd5d9cc33fa2656fa56992f7a131698fbc5

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/script.js+43 -22 Viewed

  * If the character ID doesn't exist, if the chat is being saved, or if a group is being generated, this function does nothing.
  * If the character is different from the currently selected one, it will clear the chat and reset any selected character or group.
  * @param {number} id The ID of the character to switch to.
+ * @param {object} [options] Options for the switch.
+ * @param {boolean} [options.switchMenu=true] Whether to switch the right menu to the character edit menu if the character is already selected.
+ * @returns {Promise<void>} A promise that resolves when the character is switched.
  */
-export async function selectCharacterById(id) {
+export async function selectCharacterById(id, { switchMenu = true } = {}) {
     if (characters[id] === undefined) {
         return;
+    }

@@ -1403,9 +1406,9 @@ export async function selectCharacterById(id) {
1403	}	1406	}
1404	} else {	1407	} else {
1405	//if clicked on character that was already selected	1408	//if clicked on character that was already selected
1406	selected_button = 'character_edit';	1409	switchMenu && (selected_button = 'character_edit');
1407	await unshallowCharacter(this_chid);	1410	await unshallowCharacter(this_chid);
1408	select_selected_character(this_chid);	1411	select_selected_character(this_chid, { switchMenu });
1409	}	1412	}
1410	}	1413	}
1411		1414

         body: JSON.stringify({}),
     });
     if (response.ok === true) {
+        const previousAvatar = this_chid !== undefined ? characters[this_chid]?.avatar : null;
         characters.splice(0, characters.length);
         const getData = await response.json();
         for (let i = 0; i < getData.length; i++) {

             characters[i]['chat'] = String(characters[i]['chat']);
+        }
-        if (this_chid !== undefined) {
-            $('#avatar_url_pole').val(characters[this_chid].avatar);
+        if (previousAvatar) {
+            const newCharacterId = characters.findIndex(x => x.avatar === previousAvatar);
+            if (newCharacterId >= 0) {
+                setCharacterId(newCharacterId);
+                await selectCharacterById(newCharacterId, { switchMenu: false });
+            } else {
+                await Popup.show.text(t`ERROR: The active character is no longer available.`, t`The page will be refreshed to prevent data loss. Press "OK" to continue.`);
+                return location.reload();
+            }
+        }
         await getGroups();

             await eventSource.emit(event_types.CHARACTER_RENAMED, oldAvatar, newAvatar);
+            // Unload current character
+            setCharacterId(undefined);
             // Reload characters list
             await getCharacters();

             if (newChId !== -1) {
                 // Select the character after the renaming
-                setCharacterId(undefined);
                 await selectCharacterById(newChId);
                 // Async delay to update UI

+    }
+}
-export function select_selected_character(chid) {
+/**
+ * Selects the right menu for displaying the character editor.
+ * @param {number|string} chid Character array index
+ * @param {object} [param1] Options for the switch
+ * @param {boolean} [param1.switchMenu=true] Whether to switch the menu
+ */
+export function select_selected_character(chid, { switchMenu = true } = {}) {
     //character select
     //console.log('select_selected_character() -- starting with input of -- ' + chid + ' (name:' + characters[chid].name + ')');
-    select_rm_create();
+    select_rm_create({ switchMenu });
-    setMenuType('character_edit');
+    switchMenu && setMenuType('character_edit');
     $('#delete_button').css('display', 'flex');
     $('#export_button').css('display', 'flex');
-    var display_name = characters[chid].name;
     //create text poles
     $('#rm_button_back').css('display', 'none');

     // Don't update the navbar name if we're peeking the group member defs
     if (!selected_group) {
-        $('#rm_button_selected_ch').children('h2').text(display_name);
+        $('#rm_button_selected_ch').children('h2').text(characters[chid].name);
+    }
     $('#add_avatar_button').val('');

     $('#chat_import_avatar_url').val(characters[chid].avatar);
     $('#chat_import_character_name').val(characters[chid].name);
     $('#character_json_data').val(characters[chid].json_data);
-    let this_avatar = default_avatar;
-    if (characters[chid].avatar != 'none') {
-        this_avatar = getThumbnailUrl('avatar', characters[chid].avatar);
-    }
     updateFavButtonState(characters[chid].fav || characters[chid].fav == 'true');
-    $('#avatar_load_preview').attr('src', this_avatar);
+    const avatarUrl = characters[chid].avatar != 'none' ? getThumbnailUrl('avatar', characters[chid].avatar) : default_avatar;
-    $('#name_div').removeClass('displayBlock');
+    $('#avatar_load_preview').attr('src', avatarUrl);
-    $('#name_div').addClass('displayNone');
-    $('#renameCharButton').css('display', '');
     $('.open_alternate_greetings').data('chid', chid);
     $('#set_character_world').data('chid', chid);
     setWorldInfoButtonClass(chid);
     checkEmbeddedWorld(chid);
+    $('#name_div').removeClass('displayBlock');
+    $('#name_div').addClass('displayNone');
+    $('#renameCharButton').css('display', '');
     $('#form_create').attr('actiontype', 'editcharacter');
     $('.form_create_bottom_buttons_block .chat_lorebook_button').show();

     saveSettingsDebounced();
+}
-function select_rm_create() {
+/**
-    setMenuType('create');
+ * Selects the right menu for creating a new character.
+ * @param {object} [options] Options for the switch
+ * @param {boolean} [options.switchMenu=true] Whether to switch the menu
+ */
+function select_rm_create({ switchMenu = true } = {}) {
+    switchMenu && setMenuType('create');
     //console.log('select_rm_Create() -- selected button: '+selected_button);
     if (selected_button == 'create') {

@@ -7976,7 +7997,7 @@ function select_rm_create() {
7976	}	7997	}
7977	}	7998	}
7978		7999
7979	selectRightMenuWithAnimation('rm_ch_create_block');	8000	switchMenu && selectRightMenuWithAnimation('rm_ch_create_block');
7980		8001
7981	$('#set_chat_scenario').hide();	8002	$('#set_chat_scenario').hide();
7982	$('#delete_button_div').css('display', 'none');	8003	$('#delete_button_div').css('display', 'none');