summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-02 16:09:15 +0100
committerGitHub <noreply@github.com>2019-10-02 16:09:15 +0100
commit22a6ffdf91c61340a3e43cdde6050dd072bfbfe4 (patch)
treefbb9ec14a27ab195645b161dedce66323f9dd40f /synapse
parentMerge pull request #6148 from matrix-org/erikj/find_next_generated (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_room_l... (diff)
downloadsynapse-22a6ffdf91c61340a3e43cdde6050dd072bfbfe4.tar.xz
Merge pull request #6153 from matrix-org/erikj/fix_room_list_non_federatable
Fix not showing non-federatable rooms to remote room list queries
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 9b7e31583c..615c0d3f65 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"] + "%"