Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_fede…

…ratable Fix not showing non-federatable rooms to remote room list queries
matrix-org · Oct 2, 2019 · 22a6ffd · 22a6ffd
2 parents 5d8ffdf + 5b9e5c2
commit 22a6ffd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/6153.misc 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
@@ -174,6 +174,9 @@ def get_largest_public_rooms(
 
             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"] + "%"