diff options
| author | David Baker <dave@matrix.org> | 2017-11-01 16:20:19 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-11-01 16:20:19 +0000 |
| commit | 4f0488b3070b53596bba78a6446ff09a1c50ca16 (patch) | |
| tree | 0eeb49822a2f016e77a54ec77643b33dde0a301b /synapse/federation/transport/client.py | |
| parent | Move access token deletion into auth handler (diff) | |
| parent | Merge pull request #2615 from matrix-org/rav/break_auth_device_dep (diff) | |
| download | synapse-4f0488b3070b53596bba78a6446ff09a1c50ca16.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_delete
Diffstat (limited to 'synapse/federation/transport/client.py')
| -rw-r--r-- | synapse/federation/transport/client.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index d25ae1b282..ed41dfc7ee 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -531,9 +531,9 @@ class TransportLayerClient(object): ignore_backoff=True, ) - def add_room_to_group(self, destination, group_id, requester_user_id, room_id, - content): - """Add a room to a group + def update_room_group_association(self, destination, group_id, requester_user_id, + room_id, content): + """Add or update an association between room and group """ path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,) @@ -545,7 +545,8 @@ class TransportLayerClient(object): ignore_backoff=True, ) - def remove_room_from_group(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,) |