Keep FTS indexes up to date. Only search through rooms currently joined

1 files changed, 6 insertions, 1 deletions

diff --git a/synapse/storage/search.py b/synapse/storage/search.py

index eea4477765..e66b5f9edc 100644
--- a/synapse/storage/search.py
+++ b/synapse/storage/search.py
@@ -21,11 +21,16 @@ from synapse.api.constants import KnownRoomEventKeys, SearchConstraintTypes
 
 class SearchStore(SQLBaseStore):
     @defer.inlineCallbacks
-    def search_msgs(self, constraints):
+    def search_msgs(self, room_ids, constraints):
         clauses = []
         args = []
         fts = None
 
+        clauses.append(
+            "room_id IN (%s)" % (",".join(["?"] * len(room_ids)),)
+        )
+        args.extend(room_ids)
+
         for c in constraints:
             local_clauses = []
             if c.search_type == SearchConstraintTypes.FTS: