This commit is contained in:
Luke Barnard 2017-10-31 17:20:11 +00:00
parent 20fe347906
commit 13b3d7b4a0
2 changed files with 9 additions and 5 deletions

View File

@ -531,8 +531,8 @@ class TransportLayerClient(object):
ignore_backoff=True, ignore_backoff=True,
) )
def update_room_group_association(self, destination, group_id, requester_user_id, room_id, def update_room_group_association(self, destination, group_id, requester_user_id,
content): room_id, content):
"""Add a room to a group """Add a room to a group
""" """
path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,) path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
@ -545,7 +545,8 @@ class TransportLayerClient(object):
ignore_backoff=True, ignore_backoff=True,
) )
def delete_room_group_association(self, destination, group_id, requester_user_id, room_id): def delete_room_group_association(self, destination, group_id, requester_user_id,
room_id):
"""Remove a room from a group """Remove a room from a group
""" """
path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,) path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)

View File

@ -531,7 +531,8 @@ class GroupsServerHandler(object):
}) })
@defer.inlineCallbacks @defer.inlineCallbacks
def update_room_group_association(self, group_id, requester_user_id, room_id, content): def update_room_group_association(self, group_id, requester_user_id, room_id,
content):
"""Add room to group """Add room to group
""" """
RoomID.from_string(room_id) # Ensure valid room id RoomID.from_string(room_id) # Ensure valid room id
@ -542,7 +543,9 @@ class GroupsServerHandler(object):
is_public = _parse_visibility_from_contents(content) is_public = _parse_visibility_from_contents(content)
yield self.store.update_room_group_association(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.returnValue({})