deleteSwipe now emits the deleted message Id. (#4609) * deleteSwipe now emits the deleted message Id. * Fixed: this_edit_mes_id can be a string (don't ask). Either wrap it in parseInt or Number function https://github.com/SillyTavern/SillyTavern/pull/4609#discussion_r2405534766 I think it's better to use messageId in naming. Most of weirdly abbreviated params and variables come way back from TavernAI code. https://github.com/SillyTavern/SillyTavern/pull/4609#discussion_r2405537550 * Revert outside number conversions --------- Co-authored-by: user <user@exmaple.com> Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

befb2ffb78612198ca1bf95b10f84e55ba027e15

DeclineThyself <FallenHaze@tutamail.com>

Signed

Parents: aa699a3f93c2e2808b7bc0b19a93c64490587ba4

public/script.js+15 -14 Viewed

 /**
  * Deletes a swipe from the chat.
+ *
- * @param {number?} swipeId - The ID of the swipe to delete. If not provided, the current swipe will be deleted.
+ * @param {number?} [swipeId = null] - The ID of the swipe to delete. If not provided, the current swipe will be deleted.
+ * @param {number?} [messageId = chat.length - 1] - The ID of the message to delete from. If not provided, the last message will be targeted.
  * @returns {Promise<number>|undefined} - The ID of the new swipe after deletion.
  */
-export async function deleteSwipe(swipeId = null) {
+export async function deleteSwipe(swipeId = null, messageId = chat.length - 1) {
     if (swipeId && (isNaN(swipeId) || swipeId < 0)) {
         toastr.warning(t`Invalid swipe ID: ${swipeId + 1}`);
         return;
+    }
-    const lastMessage = chat[chat.length - 1];
+    const message = chat[messageId];
-    if (!lastMessage || !Array.isArray(lastMessage.swipes) || !lastMessage.swipes.length) {
+    if (!message || !Array.isArray(message.swipes) || !message.swipes.length) {
         toastr.warning(t`No messages to delete swipes from.`);
         return;
+    }
-    if (lastMessage.swipes.length <= 1) {
+    if (message.swipes.length <= 1) {
         toastr.warning(t`Can't delete the last swipe.`);
         return;
+    }
-    swipeId = swipeId ?? lastMessage.swipe_id;
+    swipeId = swipeId ?? message.swipe_id;
-    if (swipeId < 0 || swipeId >= lastMessage.swipes.length) {
+    if (swipeId < 0 || swipeId >= message.swipes.length) {
         toastr.warning(t`Invalid swipe ID: ${swipeId + 1}`);
         return;
+    }
-    lastMessage.swipes.splice(swipeId, 1);
+    message.swipes.splice(swipeId, 1);
-    if (Array.isArray(lastMessage.swipe_info) && lastMessage.swipe_info.length) {
+    if (Array.isArray(message.swipe_info) && message.swipe_info.length) {
-        lastMessage.swipe_info.splice(swipeId, 1);
+        message.swipe_info.splice(swipeId, 1);
+    }
     // Select the next swipe, or the one before if it was the last one
-    const newSwipeId = Math.min(swipeId, lastMessage.swipes.length - 1);
+    const newSwipeId = Math.min(swipeId, message.swipes.length - 1);
-    syncSwipeToMes(null, newSwipeId);
+    syncSwipeToMes(messageId, newSwipeId);
-    await eventSource.emit(event_types.MESSAGE_SWIPE_DELETED, { swipeId, newSwipeId });
+    await eventSource.emit(event_types.MESSAGE_SWIPE_DELETED, { messageId, swipeId, newSwipeId });
     await saveChatConditional();
     await reloadCurrentChat();

         if (deleteOnlySwipe) {
             const message = chat[this_edit_mes_id];
             const swipe_id = message.swipe_id;
-            await deleteSwipe(swipe_id);
+            await deleteSwipe(swipe_id, Number(this_edit_mes_id));
             return;
+        }