summary refs log tree commit diff
path: root/synapse/groups/groups_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-27 15:10:50 +0100
committerErik Johnston <erik@matrix.org>2017-10-27 15:10:50 +0100
commit977078f06d173771cae66836b23ee76ef1a58e26 (patch)
tree69262df020bb9d79e75bb6e0d19f04714436e2e7 /synapse/groups/groups_server.py
parentMerge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse into... (diff)
downloadsynapse-977078f06d173771cae66836b23ee76ef1a58e26.tar.xz
Fix bad merge
Diffstat (limited to 'synapse/groups/groups_server.py')
-rw-r--r--synapse/groups/groups_server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/groups/groups_server.py b/synapse/groups/groups_server.py
index 7406f67d07..b021b7f77f 100644
--- a/synapse/groups/groups_server.py
+++ b/synapse/groups/groups_server.py
@@ -646,7 +646,9 @@ class GroupsServerHandler(object):
             raise SynapseError(403, "User not invited to group")
 
         if not self.hs.is_mine_id(requester_user_id):
-            local_attestation = self.attestations.create_attestation(group_id, user_id)
+            local_attestation = self.attestations.create_attestation(
+                group_id, requester_user_id,
+            )
             remote_attestation = content["attestation"]
 
             yield self.attestations.verify_attestation(