summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-02-26 11:52:52 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-02-26 11:52:52 +0000
commit6728bf39405c52e4f2473c1e19a7648134361c15 (patch)
treeed5dc38fb2e1e63833679f27a11a6ce2e97ed475 /synapse/handlers
parentResult may be None (diff)
downloadsynapse-6728bf39405c52e4f2473c1e19a7648134361c15.tar.xz
Make not showing non-federated rooms the default
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room_list.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py
index 7c21f142a0..f1a51a7ca9 100644
--- a/synapse/handlers/room_list.py
+++ b/synapse/handlers/room_list.py
@@ -328,7 +328,7 @@ class RoomListHandler(BaseHandler):
 
         result = yield self.generate_room_entry(room_id, num_joined_users)
 
-        if from_federation and not self.config.allow_non_federated_in_public_rooms:
+        if from_federation:
             if not result or result["m.federate"] is False:
                 # This is a non-federating room and the config has chosen not
                 # to show these rooms to other servers