diff options
| author | Erik Johnston <erikj@jki.re> | 2017-11-08 15:43:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 15:43:34 +0000 |
| commit | 94ff2cda73cbd1aa14b2dd07f9598733229abc00 (patch) | |
| tree | 533a5d827bd693e5f56d9fe3e146ef0887db4275 /synapse/rest/client/v2_alpha/groups.py | |
| parent | Merge pull request #2631 from xyzz/fix_appservice_event_backlog (diff) | |
| download | synapse-94ff2cda73cbd1aa14b2dd07f9598733229abc00.tar.xz | |
Revert "Modify group room association API to allow modification of is_public"
Diffstat (limited to 'synapse/rest/client/v2_alpha/groups.py')
| -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 792608cd48..c97885cfc7 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.update_room_group_association( + result = yield self.groups_handler.add_room_to_group( 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.delete_room_group_association( + result = yield self.groups_handler.remove_room_from_group( group_id, requester_user_id, room_id, ) |