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/groups/groups_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/groups/groups_server.py')
-rw-r--r-- | synapse/groups/groups_server.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py index dedc9cc7fd..e21ac8e49e 100644 --- a/synapse/groups/groups_server.py +++ b/synapse/groups/groups_server.py @@ -531,8 +531,9 @@ class GroupsServerHandler(object): }) @defer.inlineCallbacks - def add_room_to_group(self, group_id, requester_user_id, room_id, content): - """Add room to group + def update_room_group_association(self, group_id, requester_user_id, room_id, + content): + """Add or update an association between room and group """ RoomID.from_string(room_id) # Ensure valid room id @@ -542,19 +543,21 @@ class GroupsServerHandler(object): is_public = _parse_visibility_from_contents(content) - yield self.store.add_room_to_group(group_id, room_id, is_public=is_public) + yield self.store.update_room_group_association( + group_id, room_id, is_public=is_public + ) defer.returnValue({}) @defer.inlineCallbacks - def remove_room_from_group(self, group_id, requester_user_id, room_id): + def delete_room_group_association(self, group_id, requester_user_id, room_id): """Remove room from group """ yield self.check_group_is_ours( group_id, requester_user_id, and_exists=True, and_is_admin=requester_user_id ) - yield self.store.remove_room_from_group(group_id, room_id) + yield self.store.delete_room_group_association(group_id, room_id) defer.returnValue({}) |