summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuke Barnard <lukeb@openmarket.com>2017-10-16 15:41:03 +0100
committerLuke Barnard <lukeb@openmarket.com>2017-10-16 15:41:03 +0100
commita3ac4f6b0ad9cce172678fa87c10a1100d16236f (patch)
treec4624b89fe0888f5f5d79a091cc78846c77f7f49
parentMerge branch 'develop' into luke/groups-invited-users (diff)
downloadsynapse-a3ac4f6b0ad9cce172678fa87c10a1100d16236f.tar.xz
_create_rererouter for get_invited_users_in_group
-rw-r--r--synapse/handlers/groups_local.py19
1 files changed, 2 insertions, 17 deletions
diff --git a/synapse/handlers/groups_local.py b/synapse/handlers/groups_local.py
index 5263e769bb..6699d0888f 100644
--- a/synapse/handlers/groups_local.py
+++ b/synapse/handlers/groups_local.py
@@ -68,6 +68,8 @@ class GroupsLocalHandler(object):
     update_group_profile = _create_rerouter("update_group_profile")
     get_rooms_in_group = _create_rerouter("get_rooms_in_group")
 
+    get_invited_users_in_group = _create_rerouter("get_invited_users_in_group")
+
     add_room_to_group = _create_rerouter("add_room_to_group")
     remove_room_from_group = _create_rerouter("remove_room_from_group")
 
@@ -220,23 +222,6 @@ class GroupsLocalHandler(object):
         defer.returnValue(res)
 
     @defer.inlineCallbacks
-    def get_invited_users_in_group(self, group_id, requester_user_id):
-        """Get users invited to a group
-        """
-        if self.is_mine_id(group_id):
-            res = yield self.groups_server_handler.get_invited_users_in_group(
-                group_id, requester_user_id
-            )
-            defer.returnValue(res)
-
-        group_server_name = get_domain_from_id(group_id)
-
-        res = yield self.transport_client.get_users_in_group(
-            get_domain_from_id(group_id), group_id, requester_user_id,
-        )
-        defer.returnValue(res)
-
-    @defer.inlineCallbacks
     def join_group(self, group_id, user_id, content):
         """Request to join a group
         """