From f465ad71f8df096e50ebba0567c3451f2eae195b Mon Sep 17 00:00:00 2001
From: hlohaus <983577+hlohaus@users.noreply.github.com>
Date: Sat, 1 Feb 2025 01:14:38 +0100
Subject: Fix filter user messages in UI

---
 g4f/gui/client/static/css/style.css | 2 +-
 g4f/gui/client/static/js/chat.v1.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'g4f')

diff --git a/g4f/gui/client/static/css/style.css b/g4f/gui/client/static/css/style.css
index 34bc030e..29ba7501 100644
--- a/g4f/gui/client/static/css/style.css
+++ b/g4f/gui/client/static/css/style.css
@@ -1438,7 +1438,7 @@ form .field.saved .fa-xmark {
     height: 90px;
     flex: 1;
     padding: 10px;
-    padding-left: 20px;
+    padding-left: 24px;
     border-radius: 20px;
     font-size: 14px;
     margin-right: 10px;
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
index 37588101..96db3d64 100644
--- a/g4f/gui/client/static/js/chat.v1.js
+++ b/g4f/gui/client/static/js/chat.v1.js
@@ -489,6 +489,8 @@ document.querySelector(".media_player .fa-x").addEventListener("click", ()=>{
 const prepare_messages = (messages, message_index = -1, do_continue = false, do_filter = true) => {
     messages = [ ...messages ]
     if (message_index != null) {
+        console.debug("Messages Index:", message_index);
+
         // Removes messages after selected
         if (message_index >= 0) {
             messages = messages.filter((_, index) => message_index >= index);
@@ -502,6 +504,7 @@ const prepare_messages = (messages, message_index = -1, do_continue = false, do_
                     break;
                 }
             }
+            console.debug("Messages filtered:", messages);
         }
     }
     // Combine assistant messages
@@ -537,10 +540,14 @@ const prepare_messages = (messages, message_index = -1, do_continue = false, do_
         while (last_message = messages.pop()) {
             if (last_message["role"] == "user") {
                 filtered_messages.push(last_message);
+            } else {
                 break;
             }
         }
         messages = filtered_messages.reverse();
+        if (last_message) {
+            console.debug("History removed:", messages)
+        }
     }
 
     messages.forEach((new_message, i) => {
@@ -572,6 +579,7 @@ const prepare_messages = (messages, message_index = -1, do_continue = false, do_
             }
         }
     });
+    console.debug("Final messages:", final_messages)
 
     return final_messages;
 }
-- 
cgit v1.2.3