Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable

2 files changed, 4 insertions, 0 deletions

diff --git a/changelog.d/6153.misc b/changelog.d/6153.misc
new file mode 100644

index 0000000000..dfee73c28f
--- /dev/null
+++ b/changelog.d/6153.misc
@@ -0,0 +1 @@
+Improve performance of the public room list directory.
diff --git a/synapse/storage/room.py b/synapse/storage/room.py

index 4d57710a97..3e1ca6ea39 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -177,6 +177,9 @@ class RoomWorkerStore(SQLBaseStore):
 
             query_args += [last_joined_members, last_joined_members, last_room_id]
 
+        if ignore_non_federatable:
+            where_clauses.append("is_federatable")
+
         if search_filter and search_filter.get("generic_search_term", None):
             search_term = "%" + search_filter["generic_search_term"] + "%"