Added deleteMessage method (#4666) * Added deleteMessage * Simpler swipeDeletion param * Added to context * Fix review comments * Only offer swipe deletion if count of swipes > 1 * Improve array check * Fix generation broken after message deleted * Use named constant for confirmation result * Save chat immediately --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

dcab740b99eaa0358c9f9dce4ff2409b7f2d8e4e

bmen25124 <bmen25124@gmail.com>

Signed

Parents: d08f3a2eef34959307270b485c6c4d92e725ab43

public/script.js+66 -41 Viewed

     await eventSource.emit(event_types.MESSAGE_DELETED, chat.length);
+}
+/**
+ * Deletes a message from the chat by its ID, optionally asking for confirmation.
+ * @param {number} id The ID of the message to delete.
+ * @param {number} [swipeDeletionIndex] Deletes the swipe with that index.
+ * @param {boolean} [askConfirmation=false] Whether to ask for confirmation before deleting.
+ */
+export async function deleteMessage(id, swipeDeletionIndex = undefined, askConfirmation = false) {
+    if (swipeDeletionIndex !== undefined) {
+        if (swipeDeletionIndex < 0) {
+            throw new Error('Swipe index cannot be negative');
+        }
+        if (!Array.isArray(chat[id].swipes)) {
+            throw new Error('Message has no swipes to delete');
+        }
+        if (chat[id].swipes.length <= swipeDeletionIndex) {
+            throw new Error('Swipe index out of bounds');
+        }
+    }
+    const messageElement = chatElement.find(`.mes[mesid="${id}"]`);
+    if (messageElement.length === 0) {
+        return;
+    }
+    const canDeleteSwipe = swipeDeletionIndex !== undefined;
+    let deleteOnlySwipe = canDeleteSwipe;
+    if (askConfirmation) {
+        const result = await callGenericPopup(t`Are you sure you want to delete this message?`, POPUP_TYPE.CONFIRM, null, {
+            okButton: canDeleteSwipe ? t`Delete Swipe` : t`Delete Message`,
+            cancelButton: 'Cancel',
+            customButtons: canDeleteSwipe ? [t`Delete Message`] : null,
+        });
+        if (!result) {
+            return;
+        }
+        deleteOnlySwipe = canDeleteSwipe && result === POPUP_RESULT.AFFIRMATIVE; // Default button, not the custom one
+    }
+    if (deleteOnlySwipe) {
+        await deleteSwipe(swipeDeletionIndex, id);
+        return;
+    }
+    chat.splice(id, 1);
+    messageElement.remove();
+    chat_metadata['tainted'] = true;
+    const startFromZero = id === 0;
+    updateViewMessageIds(startFromZero);
+    await saveChatConditional();
+    if (this_edit_mes_id === id) {
+        this_edit_mes_id = undefined;
+    }
+    hideSwipeButtons();
+    showSwipeButtons();
+    await eventSource.emit(event_types.MESSAGE_DELETED, chat.length);
+}
 export async function reloadCurrentChat() {
     preserveNeutralChat();
     await clearChat();

     $(document).on('click', '.mes_edit_delete', async function (event, customData) {
         const fromSlashCommand = customData?.fromSlashCommand || false;
-        const canDeleteSwipe = (Array.isArray(chat[this_edit_mes_id].swipes) && chat[this_edit_mes_id].swipes.length > 1 && !chat[this_edit_mes_id].is_user && Number(this_edit_mes_id) === chat.length - 1);
-        let deleteOnlySwipe = false;
-        if (power_user.confirm_message_delete && fromSlashCommand !== true) {
-            const result = await callGenericPopup(t`Are you sure you want to delete this message?`, POPUP_TYPE.CONFIRM, null, {
-                okButton: canDeleteSwipe ? t`Delete Swipe` : t`Delete Message`,
-                cancelButton: 'Cancel',
-                customButtons: canDeleteSwipe ? [t`Delete Message`] : null,
-            });
-            if (!result) {
-                return;
-            }
-            deleteOnlySwipe = canDeleteSwipe && result === 1; // Default button, not the custom one
-        }
-        const messageElement = $(this).closest('.mes');
-        if (!messageElement) {
-            return;
-        }
-        if (deleteOnlySwipe) {
         const message = chat[this_edit_mes_id];
-            const swipe_id = message.swipe_id;
+        const selectedSwipe = message['swipe_id'] ?? undefined;
-            await deleteSwipe(swipe_id, Number(this_edit_mes_id));
+        const swipesArray = Array.isArray(message['swipes']) ? message['swipes'] : [];
-            return;
+        const canDeleteSwipe = !message.is_user && swipesArray.length > 1 && this_edit_mes_id === chat.length - 1 && selectedSwipe !== undefined;
-        }
+        await deleteMessage(Number(this_edit_mes_id), canDeleteSwipe ? selectedSwipe : undefined, power_user.confirm_message_delete && fromSlashCommand !== true);
-        chat.splice(this_edit_mes_id, 1);
-        messageElement.remove();
-        let startFromZero = Number(this_edit_mes_id) === 0;
-        this_edit_mes_id = undefined;
-        chat_metadata['tainted'] = true;
-        updateViewMessageIds(startFromZero);
-        saveChatDebounced();
-        hideSwipeButtons();
-        showSwipeButtons();
-        await eventSource.emit(event_types.MESSAGE_DELETED, chat.length);
     });
     $(document).on('click', '.mes_edit_done', async function () {

public/scripts/st-context.js+2 -0 Viewed

     generateRaw,
     showSwipeButtons,
     hideSwipeButtons,
+    deleteMessage,
 } from '../script.js';
 import {
     extension_settings,

         eventTypes: event_types,
         addOneMessage,
         deleteLastMessage,
+        deleteMessage,
         generate: Generate,
         sendStreamingRequest,
         sendGenerationRequest,