Fix not jumping twice to group chat when creating a new group chat with deleting the old one (#4602) * fix: do not jumo to chat twice on new group chat with delete * fix: prevent metadata reset when deleting non-active group chat * Bring back group chat splice call * Always delete past group metadata on chat delete --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

39fd16fe86230e551449f71d0bd9b5d28a4d4b67

Wolfsblvt <wolfsblvt@gmail.com>

Signed

public/script.js+1 -1 Viewed

     if (selected_group) {
         await createNewGroupChat(selected_group);
-        if (deleteCurrentChat) await deleteGroupChat(selected_group, chat_file_for_del);
+        if (deleteCurrentChat) await deleteGroupChat(selected_group, chat_file_for_del, { jumpToNewChat: false }); // don't jump, new chat was already created and jumped to above
+    }
     else {
         //RossAscends: added character name to new chat filenames and replaced Date.now() with humanizedDateTime;

public/scripts/group-chats.js+20 -8 Viewed

     await eventSource.emit(event_types.GROUP_CHAT_DELETED, chatName);
+}
-export async function deleteGroupChat(groupId, chatId) {
+/**
+ * Deletes a group chat by name.
+ * @param {string} groupId The ID of the group containing the chat to delete.
+ * @param {string} chatId The id/name of the chat to delete.
+ * @param {object} [options={}] Options for the deletion.
+ * @param {boolean} [options.jumpToNewChat=true] Whether to jump to a new chat after deletion (existing one, or create a new one if none exists)
+ */
+export async function deleteGroupChat(groupId, chatId, { jumpToNewChat = true } = {}) {
     const group = groups.find(x => x.id === groupId);
     if (!group || !group.chats.includes(chatId)) {

+    }
     group.chats.splice(group.chats.indexOf(chatId), 1);
-    group.chat_metadata = {};
-    group.chat_id = '';
     delete group.past_metadata[chatId];
-    updateChatMetadata(group.chat_metadata, true);
+    if (group.chat_id === chatId) {
+        group.chat_id = '';
+        group.chat_metadata = {};
+        updateChatMetadata(group.chat_metadata, true);
+    }
     const response = await fetch('/api/chats/group/delete', {
         method: 'POST',

     });
     if (response.ok) {
-        if (group.chats.length) {
+        if (jumpToNewChat) {
-            await openGroupChat(groupId, group.chats[group.chats.length - 1]);
+            if (group.chats.length) {
-        } else {
+                await openGroupChat(groupId, group.chats[group.chats.length - 1]);
-            await createNewGroupChat(groupId);
+            } else {
+                await createNewGroupChat(groupId);
+            }
+        }
         await eventSource.emit(event_types.GROUP_CHAT_DELETED, chatId);