From 2c5972f87f0541aaeff43846f7050ab91d11cf0e Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 16 Oct 2017 15:31:11 +0100
Subject: Implement GET /groups/$groupId/invited_users

---
 synapse/groups/groups_server.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'synapse/groups/groups_server.py')

diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index 1083bc2990..bfa46b7cb2 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -420,6 +420,41 @@ class GroupsServerHandler(object):
             "total_user_count_estimate": len(user_results),
         })
 
+    @defer.inlineCallbacks
+    def get_invited_users_in_group(self, group_id, requester_user_id):
+        """Get the users that have been invited to a group as seen by requester_user_id.
+
+        The ordering is arbitrary at the moment
+        """
+
+        yield self.check_group_is_ours(group_id, and_exists=True)
+
+        is_user_in_group = yield self.store.is_user_in_group(requester_user_id, group_id)
+
+        if not is_user_in_group:
+            raise SynapseError(403, "User not in group")
+
+        invited_users = yield self.store.get_invited_users_in_group(group_id)
+
+        user_profiles = []
+
+        for user_id in invited_users:
+            user_profile = {
+                "user_id": user_id
+            }
+            try:
+                profile = yield self.profile_handler.get_profile_from_cache(user)
+                user_profile.update(profile)
+            except Exception as e:
+                pass
+            user_profiles.append(user_profile)
+
+        defer.returnValue({
+            "chunk": user_profiles,
+            "total_user_count_estimate": len(invited_users),
+        })
+
+
     @defer.inlineCallbacks
     def get_rooms_in_group(self, group_id, requester_user_id):
         """Get the rooms in group as seen by requester_user_id
-- 
cgit 1.5.1


From c43e8a97367e939cd1e0b7819095950a156c9f49 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 16 Oct 2017 15:50:39 +0100
Subject: Make it work. Warn about lack of user profile

---
 synapse/groups/groups_server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'synapse/groups/groups_server.py')

diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index bfa46b7cb2..31fc711876 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -443,10 +443,10 @@ class GroupsServerHandler(object):
                 "user_id": user_id
             }
             try:
-                profile = yield self.profile_handler.get_profile_from_cache(user)
+                profile = yield self.profile_handler.get_profile_from_cache(user_id)
                 user_profile.update(profile)
             except Exception as e:
-                pass
+                logger.warn("Error getting profile for %s: %s", user_id, e)
             user_profiles.append(user_profile)
 
         defer.returnValue({
-- 
cgit 1.5.1


From 85f5674e44d695177cbff74e11b4ce6dac85d53a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 16 Oct 2017 15:52:12 +0100
Subject: Delint

---
 synapse/federation/transport/server.py | 2 ++
 synapse/groups/groups_server.py        | 1 -
 synapse/rest/client/v2_alpha/groups.py | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'synapse/groups/groups_server.py')

diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 625a2fe27f..6a0bd8d222 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -720,6 +720,7 @@ class FederationGroupsUsersServlet(BaseFederationServlet):
 
         defer.returnValue((200, new_content))
 
+
 class FederationGroupsInvitedUsersServlet(BaseFederationServlet):
     """Get the users that have been invited to a group
     """
@@ -737,6 +738,7 @@ class FederationGroupsInvitedUsersServlet(BaseFederationServlet):
 
         defer.returnValue((200, new_content))
 
+
 class FederationGroupsInviteServlet(BaseFederationServlet):
     """Ask a group server to invite someone to the group
     """
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index 31fc711876..a3a500b9d6 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -454,7 +454,6 @@ class GroupsServerHandler(object):
             "total_user_count_estimate": len(invited_users),
         })
 
-
     @defer.inlineCallbacks
     def get_rooms_in_group(self, group_id, requester_user_id):
         """Get the rooms in group as seen by requester_user_id
diff --git a/synapse/rest/client/v2_alpha/groups.py b/synapse/rest/client/v2_alpha/groups.py
index 4532112cfc..d11bccc1da 100644
--- a/synapse/rest/client/v2_alpha/groups.py
+++ b/synapse/rest/client/v2_alpha/groups.py
@@ -370,6 +370,7 @@ class GroupUsersServlet(RestServlet):
 
         defer.returnValue((200, result))
 
+
 class GroupInvitedUsersServlet(RestServlet):
     """Get users invited to a group
     """
-- 
cgit 1.5.1