Fix: Close chat before performing deletion (#4545)

85fc7fe971a459a568df6afb26d4c8b438c57fc6

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

Signed

public/script.js+45 -18 Viewed

+}
 /**
 + * Closes the current chat, clearing all associated data and resetting the UI.
 + * If a message generation is in progress, it prompts the user to stop it first.
 + * @returns {Promise<boolean>} True if the chat was successfully closed, false otherwise.
 + */
 +export async function closeCurrentChat() {
 +    if (is_send_press == false) {
 +        await waitUntilCondition(() => !isChatSaving, debounce_timeout.extended, 10);
 +        await clearChat();
 +        chat.length = 0;
 +        resetSelectedGroup();
 +        setCharacterId(undefined);
 +        setCharacterName('');
 +        setActiveCharacter(null);
 +        setActiveGroup(null);
 +        this_edit_mes_id = undefined;
 +        chat_metadata = {};
 +        selected_button = 'characters';
 +        $('#rm_button_selected_ch').children('h2').text('');
 +        select_rm_characters();
 +        await eventSource.emit(event_types.CHAT_CHANGED, getCurrentChatId());
 +        return true;
 +    } else {
 +        toastr.info(t`Please stop the message generation first.`);
 +        return false;
 +    }
 +}
++
 +/**
  * Forces the update of the chat name for a remote character.
  * @param {string|number} characterId Character ID to update chat name for
  * @param {string} newName New name for the chat

         characterKey = [characterKey];
+    }
 +    const inTempChat = this_chid === undefined && name2 === neutralCharacterName;
 +    if (inTempChat) {
 +        const confirmClose = await Popup.show.confirm(
 +            t`You are currently in a temporary chat.`,
 +            t`Deleting this character will close the chat and you will lose any unsaved messages. Do you want to proceed?`,
 +        );
 +        if (!confirmClose) {
 +            return;
 +        }
 +    }
++
 +    const closeChatResult = await closeCurrentChat();
 +    if (!closeChatResult) {
 +        return;
 +    }
++
     for (const key of characterKey) {
         const character = characters.find(x => x.avatar == key);
         if (!character) {

+        }
         else if (id == 'option_close_chat') {
 -            if (is_send_press == false) {
 +            await closeCurrentChat();
 -                await waitUntilCondition(() => !isChatSaving, debounce_timeout.extended, 10);
 -                await clearChat();
 -                chat.length = 0;
 -                resetSelectedGroup();
 -                setCharacterId(undefined);
 -                setCharacterName('');
 -                setActiveCharacter(null);
 -                setActiveGroup(null);
 -                this_edit_mes_id = undefined;
 -                chat_metadata = {};
 -                selected_button = 'characters';
 -                $('#rm_button_selected_ch').children('h2').text('');
 -                select_rm_characters();
 -                await eventSource.emit(event_types.CHAT_CHANGED, getCurrentChatId());
 -            } else {
 -                toastr.info(t`Please stop the message generation first.`);
 -            }
+        }
         else if (id === 'option_settings') {