summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorLuke Barnard <lukeb@openmarket.com>2017-10-31 17:20:11 +0000
committerLuke Barnard <lukeb@openmarket.com>2017-10-31 17:20:11 +0000
commit13b3d7b4a08d3456cf3adc0a68b2a0a2fc60098b (patch)
tree3926d73778483ec57960e35ffe738a60594be170 /synapse
parentModify group room association API to allow modification of is_public (diff)
downloadsynapse-13b3d7b4a08d3456cf3adc0a68b2a0a2fc60098b.tar.xz
Flake8
Diffstat (limited to 'synapse')
-rw-r--r--synapse/federation/transport/client.py7
-rw-r--r--synapse/groups/groups_server.py7
2 files changed, 9 insertions, 5 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index 2fcbb7069b..d513c01b7e 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -531,8 +531,8 @@ class TransportLayerClient(object):
             ignore_backoff=True,
         )
 
-    def update_room_group_association(self, destination, group_id, requester_user_id, room_id,
-                          content):
+    def update_room_group_association(self, destination, group_id, requester_user_id,
+                                      room_id, content):
         """Add a room to a group
         """
         path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
@@ -545,7 +545,8 @@ class TransportLayerClient(object):
             ignore_backoff=True,
         )
 
-    def delete_room_group_association(self, destination, group_id, requester_user_id, room_id):
+    def delete_room_group_association(self, destination, group_id, requester_user_id,
+                                      room_id):
         """Remove a room from a group
         """
         path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index c91d8e624f..69831eacbd 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -531,7 +531,8 @@ class GroupsServerHandler(object):
         })
 
     @defer.inlineCallbacks
-    def update_room_group_association(self, group_id, requester_user_id, room_id, content):
+    def update_room_group_association(self, group_id, requester_user_id, room_id,
+                                      content):
         """Add room to group
         """
         RoomID.from_string(room_id)  # Ensure valid room id
@@ -542,7 +543,9 @@ class GroupsServerHandler(object):
 
         is_public = _parse_visibility_from_contents(content)
 
-        yield self.store.update_room_group_association(group_id, room_id, is_public=is_public)
+        yield self.store.update_room_group_association(
+            group_id, room_id, is_public=is_public
+        )
 
         defer.returnValue({})