From 4c4f44930d2153056dc1b992c571f43f2d360d07 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 2 Oct 2019 15:20:36 +0100
Subject: [PATCH 1/2] Fix not showing non-federatable rooms to remote room list
 queries

---
 synapse/storage/room.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 9b7e31583..615c0d3f6 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -174,6 +174,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"] + "%"
 

From ed73f04bef517eddebb3b0f0319d6e3322d1b7ec Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 2 Oct 2019 15:24:33 +0100
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/6153.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6153.misc

diff --git a/changelog.d/6153.misc b/changelog.d/6153.misc
new file mode 100644
index 000000000..dfee73c28
--- /dev/null
+++ b/changelog.d/6153.misc
@@ -0,0 +1 @@
+Improve performance of the public room list directory.