summary refs log tree commit diff
path: root/synapse/groups/groups_server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-02-22 12:11:43 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-02-26 13:37:24 +0000
commit7a4632af9c4a26604b9d30f69eb81cb4630a82e7 (patch)
tree7edac860e2ac73df4a093486f53ddaea7bfc6b08 /synapse/groups/groups_server.py
parentMerge branch 'release-v0.33.8' (diff)
downloadsynapse-7a4632af9c4a26604b9d30f69eb81cb4630a82e7.tar.xz
Prevent showing non-fed rooms in fed /publicRooms
Diffstat (limited to 'synapse/groups/groups_server.py')
-rw-r--r--synapse/groups/groups_server.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py

index 633c865ed8..a7eaead56b 100644 --- a/synapse/groups/groups_server.py +++ b/synapse/groups/groups_server.py
@@ -113,8 +113,7 @@ class GroupsServerHandler(object): room_id = room_entry["room_id"] joined_users = yield self.store.get_users_in_room(room_id) entry = yield self.room_list_handler.generate_room_entry( - room_id, len(joined_users), - with_alias=False, allow_private=True, + room_id, len(joined_users), with_alias=False, allow_private=True, ) entry = dict(entry) # so we don't change whats cached entry.pop("room_id", None) @@ -544,8 +543,7 @@ class GroupsServerHandler(object): joined_users = yield self.store.get_users_in_room(room_id) entry = yield self.room_list_handler.generate_room_entry( - room_id, len(joined_users), - with_alias=False, allow_private=True, + room_id, len(joined_users), with_alias=False, allow_private=True, ) if not entry: