summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorLuke Barnard <lukeb@openmarket.com>2017-10-31 17:04:28 +0000
committerLuke Barnard <lukeb@openmarket.com>2017-10-31 17:04:28 +0000
commit20fe347906355e6eec2b890f5d9dc8e2c4534ce3 (patch)
tree628df3eb06d9fa513d0a6c3ce1ccdecb4115b9c9 /synapse/rest/client
parentMerge pull request #2609 from matrix-org/rav/refactor_login (diff)
downloadsynapse-20fe347906355e6eec2b890f5d9dc8e2c4534ce3.tar.xz
Modify group room association API to allow modification of is_public
also includes renamings to make things more consistent.
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/groups.py4
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,
         )