summary refs log tree commit diff
path: root/synapse/federation/transport/client.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-11-08 15:43:34 +0000
committerGitHub <noreply@github.com>2017-11-08 15:43:34 +0000
commit94ff2cda73cbd1aa14b2dd07f9598733229abc00 (patch)
tree533a5d827bd693e5f56d9fe3e146ef0887db4275 /synapse/federation/transport/client.py
parentMerge pull request #2631 from xyzz/fix_appservice_event_backlog (diff)
downloadsynapse-94ff2cda73cbd1aa14b2dd07f9598733229abc00.tar.xz
Revert "Modify group room association API to allow modification of is_public"
Diffstat (limited to 'synapse/federation/transport/client.py')
-rw-r--r--synapse/federation/transport/client.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index ed41dfc7ee..d25ae1b282 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -531,9 +531,9 @@ class TransportLayerClient(object):
             ignore_backoff=True,
         )
 
-    def update_room_group_association(self, destination, group_id, requester_user_id,
-                                      room_id, content):
-        """Add or update an association between room and group
+    def add_room_to_group(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,8 +545,7 @@ class TransportLayerClient(object):
             ignore_backoff=True,
         )
 
-    def delete_room_group_association(self, destination, group_id, requester_user_id,
-                                      room_id):
+    def remove_room_from_group(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,)