summary refs log tree commit diff
path: root/synapse/groups
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-27 09:44:34 +0100
committerErik Johnston <erik@matrix.org>2017-10-27 09:46:56 +0100
commit585972b51a033d7082b3fba4013ad2ca544c846b (patch)
treee410deb5a11cf2345c1a9a0195cc931ac1439de2 /synapse/groups
parentMerge branch 'release-v0.24.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-585972b51a033d7082b3fba4013ad2ca544c846b.tar.xz
Don't generate group attestations for local users
Diffstat (limited to 'synapse/groups')
-rw-r--r--synapse/groups/groups_server.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index 23beb3187e..96f112b580 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -609,6 +609,8 @@ class GroupsServerHandler(object):
             raise SynapseError(403, "User not invited to group")
 
         if not self.hs.is_mine_id(user_id):
+            local_attestation = self.attestations.create_attestation(group_id, user_id)
+
             remote_attestation = content["attestation"]
 
             yield self.attestations.verify_attestation(
@@ -617,10 +619,9 @@ class GroupsServerHandler(object):
                 group_id=group_id,
             )
         else:
+            local_attestation = None
             remote_attestation = None
 
-        local_attestation = self.attestations.create_attestation(group_id, user_id)
-
         is_public = _parse_visibility_from_contents(content)
 
         yield self.store.add_user_to_group(