summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuke Barnard <luke@matrix.org>2018-04-05 17:16:31 +0100
committerLuke Barnard <luke@matrix.org>2018-04-06 15:43:27 +0100
commit6850f8aea3482443dff1c330fb63f7ca8dde0025 (patch)
tree37fbff914efb2c4e4f6c2c754cdb2e02b180a286
parentDon't use redundant inlineCallbacks (diff)
downloadsynapse-6850f8aea3482443dff1c330fb63f7ca8dde0025.tar.xz
Get group_info from existing call to check_group_is_ours
-rw-r--r--synapse/groups/groups_server.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index 507ec232c5..1b516011d8 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -741,11 +741,7 @@ class GroupsServerHandler(object):
         This will error if the group requires an invite/knock to join
         """
 
-        yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True)
-
-        group_info = yield self.store.get_group(
-            group_id,
-        )
+        group_info = yield self.check_group_is_ours(group_id, requester_user_id, and_exists=True)
         if group_info['join_policy'] != "open":
             raise SynapseError(403, "Group is not publicly joinable")