Add `clearData` option to `clearChat` function (#5091) * Centralized `await clearChat();` and `chat.length = 0;` into `wipeChat()` * Added `clearData` argument to `clearChat`. --------- Co-authored-by: user <user@exmaple.com>

b64c279473be4b17be16b52caf3ce9dbf65b8eeb

DeclineThyself <235079501+DeclineThyself@users.noreply.github.com>

Signed

public/script.js+14 -13 Viewed

     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();
+            await clearChat({ clearData: true });
             cancelTtsPlay();
             resetSelectedGroup();
             this_edit_mes_id = undefined;
             selected_button = 'character_edit';
             setCharacterId(id);
-            chat.length = 0;
             chat_metadata = {};
             await getChat();
+        }

+}
 export async function replaceCurrentChat() {
-    await clearChat();
+    await clearChat({ clearData: true });
-    chat.length = 0;
     const chatsResponse = await fetch('/api/characters/chats', {
         method: 'POST',

+    }
+}
-export async function clearChat() {
+/**
+ * Visually removes all chat message elements.
+ * @param {object} [options] Options
+ * @param {boolean} [options.clearData=false] Optionally clear the chat array's contents.
+ */
+export async function clearChat({ clearData = false } = {}) {
     cancelDebouncedChatSave();
     cancelDebouncedMetadataSave();
     closeMessageEditor();

     await saveItemizedPrompts(getCurrentChatId());
     itemizedPrompts.length = 0;
+    if (clearData) chat.length = 0;
+}
 export async function deleteLastMessage() {

  */
 export async function reloadCurrentChatUnsafe() {
     preserveNeutralChat();
-    await clearChat();
+    await clearChat({ clearData: true });
-    chat.length = 0;
     if (selected_group) {
         await getGroupChat(selected_group, true);

 export async function openCharacterChat(file_name) {
     await waitUntilCondition(() => !isChatSaving, debounce_timeout.extended, 10);
-    await clearChat();
+    await clearChat({ clearData: true });
     characters[this_chid].chat = file_name;
-    chat.length = 0;
     chat_metadata = {};
     await getChat();
     $('#selected_chat_pole').val(file_name);

     //Fix it; New chat doesn't create while open create character menu
     await waitUntilCondition(() => !isChatSaving, debounce_timeout.extended, 10);
-    await clearChat();
+    await clearChat({ clearData: true });
-    chat.length = 0;
     chat_file_for_del = getCurrentChatDetails()?.sessionName;

 export async function closeCurrentChat() {
     if (is_send_press == false) {
         await waitUntilCondition(() => !isChatSaving, debounce_timeout.extended, 10);
-        await clearChat();
+        await clearChat({ clearData: true });
-        chat.length = 0;
         resetSelectedGroup();
         setCharacterId(undefined);
         setCharacterName('');

public/scripts/group-chats.js+3 -6 Viewed

         if (selected_group !== groupId) {
             groupChatQueueOrder = new Map();
-            await clearChat();
+            await clearChat({ clearData: true });
             cancelTtsPlay();
             selected_group = groupId;
             setCharacterId(undefined);
             setCharacterName('');
             setEditedMessageId(undefined);
             updateChatMetadata({}, true);
-            chat.length = 0;
             await getGroupChat(groupId);
             return true;
+        }

         return;
+    }
-    await clearChat();
+    await clearChat({ clearData: true });
-    chat.length = 0;
     const newChatName = humanizedDateTime();
     group.chats.push(newChatName);
     group.chat_id = newChatName;

         return;
+    }
-    await clearChat();
+    await clearChat({ clearData: true });
-    chat.length = 0;
     group.chat_id = chatId;
     group.date_last_chat = Date.now();
     updateChatMetadata({}, true);