summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-26 12:12:58 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-26 12:12:58 +0000
commit4d48fbaa526a3107681c6a09cf4f7487ab3736ab (patch)
treecb7b5e2924f04f0aec13d8022b2d159972ef7d8b /synapse
parentMerge pull request #6148 from matrix-org/erikj/find_next_generated (diff)
parentMerge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable (diff)
downloadsynapse-4d48fbaa526a3107681c6a09cf4f7487ab3736ab.tar.xz
Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/room.py3
1 files changed, 3 insertions, 0 deletions
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"] + "%"