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/server.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/server.py')
| -rw-r--r-- | synapse/federation/transport/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 8f3c14c303..ded6d4edc9 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -684,7 +684,7 @@ class FederationGroupsAddRoomsServlet(BaseFederationServlet): if get_domain_from_id(requester_user_id) != origin: raise SynapseError(403, "requester_user_id doesn't match origin") - new_content = yield self.handler.add_room_to_group( + new_content = yield self.handler.update_room_group_association( group_id, requester_user_id, room_id, content ) @@ -696,7 +696,7 @@ class FederationGroupsAddRoomsServlet(BaseFederationServlet): if get_domain_from_id(requester_user_id) != origin: raise SynapseError(403, "requester_user_id doesn't match origin") - new_content = yield self.handler.remove_room_from_group( + new_content = yield self.handler.delete_room_group_association( group_id, requester_user_id, room_id, ) |