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/rest | |
| 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/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/groups.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/groups.py b/synapse/rest/client/v2_alpha/groups.py index c97885cfc7..792608cd48 100644 --- a/synapse/rest/client/v2_alpha/groups.py +++ b/synapse/rest/client/v2_alpha/groups.py @@ -451,7 +451,7 @@ class GroupAdminRoomsServlet(RestServlet): requester_user_id = requester.user.to_string() content = parse_json_object_from_request(request) - result = yield self.groups_handler.add_room_to_group( + result = yield self.groups_handler.update_room_group_association( group_id, requester_user_id, room_id, content, ) @@ -462,7 +462,7 @@ class GroupAdminRoomsServlet(RestServlet): requester = yield self.auth.get_user_by_req(request) requester_user_id = requester.user.to_string() - result = yield self.groups_handler.remove_room_from_group( + result = yield self.groups_handler.delete_room_group_association( group_id, requester_user_id, room_id, ) |