Merge pull request #2472 from matrix-org/erikj/groups_rooms

Add remove room from group API
This commit is contained in:
Erik Johnston 2017-09-26 16:05:46 +01:00 committed by GitHub
commit 1e5fcfd14a
7 changed files with 73 additions and 4 deletions

View File

@ -525,6 +525,18 @@ class TransportLayerClient(object):
ignore_backoff=True, ignore_backoff=True,
) )
def remove_room_from_group(self, destination, group_id, requester_user_id, room_id):
"""Remove a room from a group
"""
path = PREFIX + "/groups/%s/room/%s" % (group_id, room_id,)
return self.client.delete_json(
destination=destination,
path=path,
args={"requester_user_id": requester_user_id},
ignore_backoff=True,
)
@log_function @log_function
def get_users_in_group(self, destination, group_id, requester_user_id): def get_users_in_group(self, destination, group_id, requester_user_id):
"""Get users in a group """Get users in a group

View File

@ -674,7 +674,7 @@ class FederationGroupsRoomsServlet(BaseFederationServlet):
class FederationGroupsAddRoomsServlet(BaseFederationServlet): class FederationGroupsAddRoomsServlet(BaseFederationServlet):
"""Add room to group """Add/remove room from group
""" """
PATH = "/groups/(?P<group_id>[^/]*)/room/(?<room_id>)$" PATH = "/groups/(?P<group_id>[^/]*)/room/(?<room_id>)$"
@ -690,6 +690,18 @@ class FederationGroupsAddRoomsServlet(BaseFederationServlet):
defer.returnValue((200, new_content)) defer.returnValue((200, new_content))
@defer.inlineCallbacks
def on_DELETE(self, origin, content, query, group_id, room_id):
requester_user_id = parse_string_from_args(query, "requester_user_id")
if get_domain_from_id(requester_user_id) != origin:
raise SynapseError(403, "requester_user_id doesn't match origin")
new_content = yield self.handler.remove_room_from_group(
group_id, requester_user_id, room_id,
)
defer.returnValue((200, new_content))
class FederationGroupsUsersServlet(BaseFederationServlet): class FederationGroupsUsersServlet(BaseFederationServlet):
"""Get the users in a group on behalf of a user """Get the users in a group on behalf of a user

View File

@ -466,14 +466,24 @@ class GroupsServerHandler(object):
group_id, and_exists=True, and_is_admin=requester_user_id group_id, and_exists=True, and_is_admin=requester_user_id
) )
# TODO: Check if room has already been added
is_public = _parse_visibility_from_contents(content) 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.add_room_to_group(group_id, room_id, is_public=is_public)
defer.returnValue({}) defer.returnValue({})
@defer.inlineCallbacks
def remove_room_from_group(self, group_id, requester_user_id, room_id):
"""Remove room from group
"""
yield self.check_group_is_ours(
group_id, and_exists=True, and_is_admin=requester_user_id
)
yield self.store.remove_room_from_group(group_id, room_id)
defer.returnValue({})
@defer.inlineCallbacks @defer.inlineCallbacks
def invite_to_group(self, group_id, user_id, requester_user_id, content): def invite_to_group(self, group_id, user_id, requester_user_id, content):
"""Invite user to group """Invite user to group

View File

@ -69,6 +69,7 @@ class GroupsLocalHandler(object):
get_rooms_in_group = _create_rerouter("get_rooms_in_group") get_rooms_in_group = _create_rerouter("get_rooms_in_group")
add_room_to_group = _create_rerouter("add_room_to_group") add_room_to_group = _create_rerouter("add_room_to_group")
remove_room_from_group = _create_rerouter("remove_room_from_group")
update_group_summary_room = _create_rerouter("update_group_summary_room") update_group_summary_room = _create_rerouter("update_group_summary_room")
delete_group_summary_room = _create_rerouter("delete_group_summary_room") delete_group_summary_room = _create_rerouter("delete_group_summary_room")

View File

@ -423,6 +423,17 @@ class GroupAdminRoomsServlet(RestServlet):
defer.returnValue((200, result)) defer.returnValue((200, result))
@defer.inlineCallbacks
def on_DELETE(self, request, group_id, room_id):
requester = yield self.auth.get_user_by_req(request)
user_id = requester.user.to_string()
result = yield self.groups_handler.remove_room_from_group(
group_id, user_id, room_id,
)
defer.returnValue((200, result))
class GroupAdminUsersInviteServlet(RestServlet): class GroupAdminUsersInviteServlet(RestServlet):
"""Invite a user to the group """Invite a user to the group

View File

@ -843,6 +843,29 @@ class GroupServerStore(SQLBaseStore):
desc="add_room_to_group", desc="add_room_to_group",
) )
def remove_room_from_group(self, group_id, room_id):
def _remove_room_from_group_txn(txn):
self._simple_delete_txn(
txn,
table="group_rooms",
keyvalues={
"group_id": group_id,
"room_id": room_id,
},
)
self._simple_delete_txn(
txn,
table="group_summary_rooms",
keyvalues={
"group_id": group_id,
"room_id": room_id,
},
)
return self.runInteraction(
"remove_room_from_group", _remove_room_from_group_txn,
)
def get_publicised_groups_for_user(self, user_id): def get_publicised_groups_for_user(self, user_id):
"""Get all groups a user is publicising """Get all groups a user is publicising
""" """

View File

@ -52,7 +52,7 @@ CREATE TABLE group_rooms (
is_public BOOLEAN NOT NULL -- whether the room can be seen by everyone is_public BOOLEAN NOT NULL -- whether the room can be seen by everyone
); );
CREATE INDEX groups_rooms_g_idx ON group_rooms(group_id, room_id); CREATE UNIQUE INDEX groups_rooms_g_idx ON group_rooms(group_id, room_id);
CREATE INDEX groups_rooms_r_idx ON group_rooms(room_id); CREATE INDEX groups_rooms_r_idx ON group_rooms(room_id);