fix #7748 -- chat: finish changing chat filtering to be on the thread level, rather than each message

Author: williamstein

src/packages/frontend/chat/actions.ts

@@ -192,7 +192,7 @@ export class ChatActions extends Actions<ChatState> {
     });
   }
 
-  public foldThread(reply_to: Date, msgIndex: number) {
+  public foldThread(reply_to: Date, messageIndex?: number) {
     if (this.syncdb == null) return;
     const account_id = this.redux.getStore("account").get_account_id();
     const cur = this.syncdb.get_one({ event: "chat", date: reply_to });
@@ -209,8 +209,8 @@ export class ChatActions extends Actions<ChatState> {
 
     this.syncdb.commit();
 
-    if (folded && msgIndex != null) {
-      this.scrollToBottom(msgIndex);
+    if (folded && messageIndex != null) {
+      this.scrollToBottom(messageIndex);
     }
   }
 
@@ -293,41 +293,44 @@ export class ChatActions extends Actions<ChatState> {
       // For replies search find full threads not individual messages.
       this.setState({
         input: "",
-        search: "",
-        selectedHashtags: immutableMap(),
       });
+      this.clearAllFilters();
     } else {
-      // TODO: but until we improve search to be by thread (instead of by message), do this:
-      this.setState({
-        search: "",
-        selectedHashtags: immutableMap(),
-      });
-    }
-
-    if (this.store != null) {
-      const project_id = this.store?.get("project_id");
-      const path = this.store?.get("path");
-      // set notification saying that we sent an actual chat
-      let action;
+      // when replying we make sure that the thread is expanded, since otherwise
+      // our reply won't be visible
+      const messages = this.store.get("messages");
       if (
-        noNotification ||
-        mentionsLanguageModel(input) ||
-        this.isLanguageModelThread(reply_to)
+        messages
+          ?.getIn([`${reply_to.valueOf()}`, "folding"])
+          ?.includes(sender_id)
       ) {
-        // Note: don't mark it is a chat if it is with chatgpt,
-        // since no point in notifying all collabs of this.
-        action = "edit";
-      } else {
-        action = "chat";
+        this.foldThread(reply_to);
       }
-      webapp_client.mark_file({
-        project_id,
-        path,
-        action,
-        ttl: 10000,
-      });
-      track("send_chat", { project_id, path });
     }
+
+    const project_id = this.store?.get("project_id");
+    const path = this.store?.get("path");
+    // set notification saying that we sent an actual chat
+    let action;
+    if (
+      noNotification ||
+      mentionsLanguageModel(input) ||
+      this.isLanguageModelThread(reply_to)
+    ) {
+      // Note: don't mark it is a chat if it is with chatgpt,
+      // since no point in notifying all collabs of this.
+      action = "edit";
+    } else {
+      action = "chat";
+    }
+    webapp_client.mark_file({
+      project_id,
+      path,
+      action,
+      ttl: 10000,
+    });
+    track("send_chat", { project_id, path });
+
     this.save_to_disk();
     (async () => {
       await this.processLLM({
@@ -1099,6 +1102,14 @@ export class ChatActions extends Actions<ChatState> {
       foreground_project: true,
     });
   };
+
+  clearAllFilters = () => {
+    this.setState({
+      search: "",
+      selectedHashtags: immutableMap(),
+      filterRecentH: 0,
+    });
+  };
 }
 
 export function getRootMessage(

src/packages/frontend/chat/chat-log.tsx

@@ -232,6 +232,7 @@ function isThread(messages: ChatMessages, message: ChatMessageTyped) {
   if (message.get("reply_to") != null) {
     return true;
   }
+
   // TODO/WARNING!!! This is a linear search
   // through all messages to decide if a message is the root of a thread.
   // This is VERY BAD and must to be redone at some point, since we call isThread
@@ -240,9 +241,8 @@ function isThread(messages: ChatMessages, message: ChatMessageTyped) {
   // use a proper data structure (or even a cache) to track this once
   // and for all.  It's more complicated but everything needs to be at
   // most O(n).
-  return messages.some(
-    (m) => m.get("reply_to") === message.get("date").toISOString(),
-  );
+  const s = message.get("date").toISOString();
+  return messages.some((m) => m.get("reply_to") === s);
 }
 
 function isFolded(
@@ -383,7 +383,6 @@ export function MessageList({
   account_id,
   virtuosoRef,
   sortedDates,
-  search,
   user_map,
   project_id,
   path,
@@ -438,10 +437,7 @@ export function MessageList({
         }
 
         const is_thread = isThread(messages, message);
-        // if we search for a message, we treat all threads as unfolded
-        const force_unfold = !!search;
-        const is_folded =
-          !force_unfold && isFolded(messages, message, account_id);
+        const is_folded = isFolded(messages, message, account_id);
         const is_thread_body = message.get("reply_to") != null;
         const h = virtuosoHeightsRef.current[index];
 
@@ -461,7 +457,6 @@ export function MessageList({
                 actions={actions}
                 is_thread={is_thread}
                 is_folded={is_folded}
-                force_unfold={force_unfold}
                 is_thread_body={is_thread_body}
                 is_prev_sender={isPrevMessageSender(
                   index,

src/packages/frontend/chat/filter-messages.ts

@@ -20,23 +20,36 @@ export function filterMessages({
   filter?: string;
   filterRecentH?: number;
 }) {
+  let messages0 = messages;
   if (filter) {
     const searchTerms = search_split(filter);
-    messages = messages.filter((message) =>
+    messages0 = messages0.filter((message) =>
       searchMatches(message, searchTerms),
     );
   }
 
   if (typeof filterRecentH === "number" && filterRecentH > 0) {
     const now = webapp_client.server_time().getTime();
     const cutoff = now - filterRecentH * 1000 * 60 * 60;
-    messages = messages.filter((msg) => {
-      const date = msg.get("date").getTime();
+    messages0 = messages0.filter((message) => {
+      const date = message.get("date").getTime();
       return date >= cutoff;
     });
   }
 
-  return messages;
+  if (messages0.size == 0) {
+    // nothing matches
+    return messages0;
+  }
+
+  // Next, we expand to include all threads containing any matching messages.
+  // First find the roots of all matching threads:
+  const roots = new Set<string>();
+  for (const [_, message] of messages0) {
+    roots.add(message.get("reply_to") ?? message.get("date").toISOString());
+  }
+  // Return all messages in these threads
+  return messages.filter((message) => roots.has(message.get("reply_to") ?? message.get("date").toISOString()));
 }
 
 // NOTE: I removed search including send name, since that would

src/packages/frontend/chat/message.tsx

@@ -122,15 +122,13 @@ interface Props {
   is_thread?: boolean; // if true, there is a thread starting in a reply_to message
   is_folded?: boolean; // if true, only show the reply_to root message
   is_thread_body: boolean;
-  force_unfold?: boolean; // if true, all threads are temporarily forced to be unfolded
 
   llm_cost_reply?: [number, number] | null;
 }
 
 export default function Message(props: Readonly<Props>) {
   const {
     is_folded,
-    force_unfold,
     is_thread_body,
     is_thread,
     llm_cost_reply,
@@ -882,7 +880,6 @@ export default function Message(props: Readonly<Props>) {
         <Button
           type="text"
           style={style}
-          disabled={force_unfold}
           onClick={() =>
             props.actions?.foldThread(message.get("date"), props.index)
           }

src/packages/frontend/chat/side-chat.tsx

@@ -212,6 +212,7 @@ export default function SideChat({ project_id, path, style }: Props) {
           on_send={() => {
             sendChat(lastVisible ? { reply_to: lastVisible } : undefined);
             user_activity("side_chat", "send_chat", "keyboard");
+            actions?.clearAllFilters();
           }}
           style={{ height: INPUT_HEIGHT }}
           height={INPUT_HEIGHT}