Merge pull request #3584 from SillyTavern/chid-unify-type Always use string for this_chid

969156d819501b0c9b264aec20dc9ff2bff2dc54

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

Signed

public/script.js+32 -7 Viewed

 let generation_started = new Date();
 /** @type {import('./scripts/char-data.js').v1CharData[]} */
 export let characters = [];
 +/**
 + * Stringified index of a currently chosen entity in the characters array.
 + * @type {string|undefined} Yes, we hate it as much as you do.
 + */
 export let this_chid;
 let saveCharactersPage = 0;
 export const default_avatar = 'img/ai4.png';

         return;
+    }
     if (selected_group || String(this_chid) !== String(id)) {
         //if clicked on a different character from what was currently selected
         if (!is_send_press) {
             await clearChat();

             resetSelectedGroup();
             this_edit_mes_id = undefined;
             selected_button = 'character_edit';
 -            this_chid = id;
 +            setCharacterId(id);
             chat.length = 0;
             chat_metadata = {};
             await getChat();

     // replaces deleted charcter name with system user since it will be displayed next.
     name2 = (this_chid === undefined && neutralCharacterName) ? neutralCharacterName : systemUserName;
     //unsets expected chid before reloading (related to getCharacters/printCharacters from using old arrays)
 -    this_chid = undefined;
 +    setCharacterId(undefined);
     // sets up system user to tell user about having deleted a character
     chat.splice(0, chat.length, ...SAFETY_CHAT);
     // resets chat metadata

     abortController = controller;
+}
 +/**
 + * Sets a character array index.
 + * @param {number|string|undefined} value
 + */
 export function setCharacterId(value) {
 -    this_chid = value;
 +    switch (typeof value) {
 +        case 'bigint':
 +        case 'number':
 +            this_chid = String(value);
 +            break;
 +        case 'string':
 +            this_chid = !isNaN(parseInt(value)) ? value : undefined;
 +            break;
 +        case 'object':
 +            this_chid = characters.indexOf(value) !== -1 ? String(characters.indexOf(value)) : undefined;
 +            break;
 +        case 'undefined':
 +            this_chid = undefined;
 +            break;
 +        default:
 +            console.error('Invalid character ID type:', value);
 +            break;
 +    }
+}
 export function setCharacterName(value) {

             if (newChId !== -1) {
                 // Select the character after the renaming
 -                this_chid = -1;
 +                setCharacterId(undefined);
                 await selectCharacterById(newChId);
                 // Async delay to update UI
                 await delay(1);
                 if (this_chid === -1undefined) {
                     throw new Error('New character not selected');
+                }

@@ -7658,7 +7683,7 @@ export function select_rm_info(type, charId, previousCharId = null) {
7658	7683	if (previousCharId) {
7659	7684	const newId = characters.findIndex((x) => x.avatar == previousCharId);
7660	7685	if (newId >= 0) {
7661		- this_chid = newId;
	7686	+ setCharacterId(newId);
7662	7687	}
7663	7688	}
7664	7689	}

public/scripts/BulkEditOverlay.js+2 -2 Viewed

     /**
      * @typedef {object} LastSelected - An object noting the last selected character and its state.
      * @property {stringnumber} [characterId] - The character id of the last selected character.
      * @property {boolean} [select] - The selected state of the last selected character. <c>true</c> if it was selected, <c>false</c> if it was deselected.
      */

         const characterId = Number(currentCharacter.getAttribute('data-chid'));
         const select = !this.selectedCharacters.includes(characterId);
         if (this.lastSelected.characterId >= 0 && this.lastSelected.select !== undefined) {
             // Only if select state and the last select state match we execute the range select
             if (select === this.lastSelected.select) {
                 this.toggleCharactersInRange(currentCharacter, select);