diff options
| author | Luke Barnard <lukebarnard1@users.noreply.github.com> | 2017-11-01 11:08:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 11:08:36 +0000 |
| commit | 99354b430e224f8e949a3667fcd1ed75c92a060a (patch) | |
| tree | e30b5ffb903071029757c08b1409ea1971619b1c /synapse/federation/transport/server.py | |
| parent | Merge pull request #2610 from matrix-org/rav/schema_for_pw_providers (diff) | |
| parent | Leave `is_public` as required argument of update_room_group_association (diff) | |
| download | synapse-99354b430e224f8e949a3667fcd1ed75c92a060a.tar.xz | |
Merge pull request #2612 from matrix-org/luke/groups-room-relationship-is-public
Modify group room association API to allow modification of is_public
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, ) |