search: allow empty term

Signed-off-by: Jonas Fentker <jonas@fentker.eu>
matrix-org · Jul 8, 2020 · d535efe · d535efe
1 parent cbdbdb6
commit d535efe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/Searching.js b/src/Searching.js
@@ -29,18 +29,21 @@ async function serverSideSearch(term, roomId = undefined, senderId = undefined)
     if (roomId !== undefined) filter.rooms = [roomId];
     if (senderId !== undefined) filter.senders = [senderId];
 
+    const room_events = {
+        filter: filter,
+        order_by: "recent",
+        event_context: {
+            before_limit: 1,
+            after_limit: 1,
+            include_profile: true,
+        },
+    };
+
+    if (term !== "") room_events.search_term = term;
+
     const body = {
         search_categories: {
-            room_events: {
-                search_term: term,
-                filter: filter,
-                order_by: "recent",
-                event_context: {
-                    before_limit: 1,
-                    after_limit: 1,
-                    include_profile: true,
-                },
-            },
+            room_events: room_events,
         },
     };
 

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
@@ -1239,8 +1239,9 @@ export default createReactClass({
             // whether it was used by the search engine or not.
 
             let highlights = results.highlights;
-            if (highlights.indexOf(self.state.searchTerm) < 0) {
-                highlights = highlights.concat(self.state.searchTerm);
+            let searchTerm = self.state.searchTerm ;
+            if (searchTerm !== "" && highlights.indexOf(searchTerm) < 0) {
+                highlights = highlights.concat(searchTerm);
             }
 
             // For overlapping highlights,