Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup

This commit is contained in:
Erik Johnston 2017-10-27 10:30:21 +01:00
parent 195abfe7a5
commit 82d8c1bacb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/groups/attestations.py
View File

@ -128,11 +128,9 @@ class GroupAttestionRenewer(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def _renew_attestation(group_id, user_id): def _renew_attestation(group_id, user_id):
attestation = self.attestations.create_attestation(group_id, user_id)
if not self.is_mine_id(group_id): if not self.is_mine_id(group_id):
destination = get_domain_from_id(group_id) destination = get_domain_from_id(group_id)
else not self.is_mine_id(user_id): elif not self.is_mine_id(user_id):
destination = get_domain_from_id(user_id) destination = get_domain_from_id(user_id)
else: else:
logger.warn( logger.warn(
@ -142,6 +140,8 @@ class GroupAttestionRenewer(object):
yield self.store.remove_attestation_renewal(group_id, user_id) yield self.store.remove_attestation_renewal(group_id, user_id)
return return
attestation = self.attestations.create_attestation(group_id, user_id)
yield self.transport_client.renew_group_attestation( yield self.transport_client.renew_group_attestation(
destination, group_id, user_id, destination, group_id, user_id,
content={"attestation": attestation}, content={"attestation": attestation},

4
synapse/storage/group_server.py
View File

@ -1095,8 +1095,8 @@ class GroupServerStore(SQLBaseStore):
group_id (str) group_id (str)
user_id (str) user_id (str)
""" """
return self._simple_update_one( return self._simple_delete(
table="_simple_delete", table="group_attestations_renewals",
keyvalues={ keyvalues={
"group_id": group_id, "group_id": group_id,
"user_id": user_id, "user_id": user_id,