diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-02-26 13:22:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 13:22:06 +0000 |
| commit | c0b6955e3b6d4ee40333b68f35a6cf96925c342a (patch) | |
| tree | 0e810f5eddc0ea1fe93059a6a7d5104d11530b09 /synapse/groups | |
| parent | Merge pull request #4736 from matrix-org/anoa/public_rooms_federate (diff) | |
| parent | Revert "Prevent showing non-fed rooms in fed /publicRooms" (diff) | |
| download | synapse-c0b6955e3b6d4ee40333b68f35a6cf96925c342a.tar.xz | |
Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federate
Revert "Prevent showing non-fed rooms in fed /publicRooms"
Diffstat (limited to 'synapse/groups')
| -rw-r--r-- | synapse/groups/groups_server.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py index a7eaead56b..633c865ed8 100644 --- a/synapse/groups/groups_server.py +++ b/synapse/groups/groups_server.py @@ -113,7 +113,8 @@ 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) @@ -543,7 +544,8 @@ 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: |