diff options
| author | Luke Barnard <luke@matrix.org> | 2018-04-05 17:32:20 +0100 |
|---|---|---|
| committer | Luke Barnard <luke@matrix.org> | 2018-04-06 15:43:27 +0100 |
| commit | 112c2253e2846b48b75f4171d9dd94bfe6ecc8a1 (patch) | |
| tree | 0c5066f065b5e37fb1ac12d48d0fef2cadc97c02 /synapse | |
| parent | Get group_info from existing call to check_group_is_ours (diff) | |
| download | synapse-112c2253e2846b48b75f4171d9dd94bfe6ecc8a1.tar.xz | |
pep8
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/federation/transport/client.py | 2 | ||||
| -rw-r--r-- | synapse/groups/groups_server.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 67ff7da51b..50a967a7ec 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -872,7 +872,7 @@ class TransportLayerClient(object): @log_function def set_group_join_policy(self, destination, group_id, requester_user_id, - content): + content): """Sets the join policy for a group """ path = PREFIX + "/groups/%s/settings/m.join_policy" % (group_id,) diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py index 1b516011d8..15d31549de 100644 --- a/synapse/groups/groups_server.py +++ b/synapse/groups/groups_server.py @@ -741,7 +741,9 @@ class GroupsServerHandler(object): This will error if the group requires an invite/knock to join """ - group_info = yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True) + group_info = yield self.check_group_is_ours( + group_id, requester_user_id, and_exists=True + ) if group_info['join_policy'] != "open": raise SynapseError(403, "Group is not publicly joinable") |