diff options
author | Luke Barnard <lukebarnard1@users.noreply.github.com> | 2017-10-16 17:33:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-16 17:33:33 +0200 |
commit | e0a75e0c253321bca6f00f79815eac11ce003988 (patch) | |
tree | 68e666ef8c0c3f478aba9dab51c1d7c66cad9f5b /synapse/federation | |
parent | Merge pull request #2543 from matrix-org/luke/fix-on-group-invite-no-profile (diff) | |
parent | Delint (diff) | |
download | synapse-e0a75e0c253321bca6f00f79815eac11ce003988.tar.xz |
Merge pull request #2544 from matrix-org/luke/groups-invited-users
Implement GET /groups/$groupId/invited_users
Diffstat (limited to 'synapse/federation')
-rw-r--r-- | synapse/federation/transport/client.py | 13 | ||||
-rw-r--r-- | synapse/federation/transport/server.py | 20 |
2 files changed, 32 insertions, 1 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index f96561c1fe..125d8f3598 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -551,6 +551,19 @@ class TransportLayerClient(object): ) @log_function + def get_invited_users_in_group(self, destination, group_id, requester_user_id): + """Get users that have been invited to a group + """ + path = PREFIX + "/groups/%s/invited_users" % (group_id,) + + return self.client.get_json( + destination=destination, + path=path, + args={"requester_user_id": requester_user_id}, + ignore_backoff=True, + ) + + @log_function def accept_group_invite(self, destination, group_id, user_id, content): """Accept a group invite """ diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index c7565e0737..6a0bd8d222 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -721,6 +721,24 @@ class FederationGroupsUsersServlet(BaseFederationServlet): defer.returnValue((200, new_content)) +class FederationGroupsInvitedUsersServlet(BaseFederationServlet): + """Get the users that have been invited to a group + """ + PATH = "/groups/(?P<group_id>[^/]*)/invited_users$" + + @defer.inlineCallbacks + def on_GET(self, origin, content, query, group_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.get_invited_users_in_group( + group_id, requester_user_id + ) + + defer.returnValue((200, new_content)) + + class FederationGroupsInviteServlet(BaseFederationServlet): """Ask a group server to invite someone to the group """ @@ -1109,12 +1127,12 @@ ROOM_LIST_CLASSES = ( PublicRoomList, ) - GROUP_SERVER_SERVLET_CLASSES = ( FederationGroupsProfileServlet, FederationGroupsSummaryServlet, FederationGroupsRoomsServlet, FederationGroupsUsersServlet, + FederationGroupsInvitedUsersServlet, FederationGroupsInviteServlet, FederationGroupsAcceptInviteServlet, FederationGroupsRemoveUserServlet, |