pull/4/merge
Luke Barnard 7 years ago
parent c43e8a9736
commit 85f5674e44
  1. 2
      synapse/federation/transport/server.py
  2. 1
      synapse/groups/groups_server.py
  3. 1
      synapse/rest/client/v2_alpha/groups.py

@ -720,6 +720,7 @@ class FederationGroupsUsersServlet(BaseFederationServlet):
defer.returnValue((200, new_content)) defer.returnValue((200, new_content))
class FederationGroupsInvitedUsersServlet(BaseFederationServlet): class FederationGroupsInvitedUsersServlet(BaseFederationServlet):
"""Get the users that have been invited to a group """Get the users that have been invited to a group
""" """
@ -737,6 +738,7 @@ class FederationGroupsInvitedUsersServlet(BaseFederationServlet):
defer.returnValue((200, new_content)) defer.returnValue((200, new_content))
class FederationGroupsInviteServlet(BaseFederationServlet): class FederationGroupsInviteServlet(BaseFederationServlet):
"""Ask a group server to invite someone to the group """Ask a group server to invite someone to the group
""" """

@ -454,7 +454,6 @@ class GroupsServerHandler(object):
"total_user_count_estimate": len(invited_users), "total_user_count_estimate": len(invited_users),
}) })
@defer.inlineCallbacks @defer.inlineCallbacks
def get_rooms_in_group(self, group_id, requester_user_id): def get_rooms_in_group(self, group_id, requester_user_id):
"""Get the rooms in group as seen by requester_user_id """Get the rooms in group as seen by requester_user_id

@ -370,6 +370,7 @@ class GroupUsersServlet(RestServlet):
defer.returnValue((200, result)) defer.returnValue((200, result))
class GroupInvitedUsersServlet(RestServlet): class GroupInvitedUsersServlet(RestServlet):
"""Get users invited to a group """Get users invited to a group
""" """

Loading…
Cancel
Save