Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:16:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

update to work with newer code, and fix formatting

Browse source
This commit is contained in:
Hubert Chathi 2019-10-22 21:44:58 -04:00
parent 41ad35b523
commit 1fabf82d50
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
synapse/handlers/e2e_keys.py
View file

@ -260,7 +260,7 @@ class E2eKeysHandler(object):
Returns:
defer.Deferred[dict[str, dict[str, dict]]]: map from
(master|self_signing|user_signing) -> user_id -> key
(master_keys|self_signing_keys|user_signing_keys) -> user_id -> key
"""
master_keys = {}
self_signing_keys = {}
@ -355,10 +355,11 @@ class E2eKeysHandler(object):
ret = {"device_keys": res}
# add in the cross-signing keys
cross_signing_keys = yield self.query_cross_signing_keys(device_keys_query, None)
cross_signing_keys = yield self.get_cross_signing_keys_from_cache(
device_keys_query, None
)
for key, value in iteritems(cross_signing_keys):
ret[key + "_keys"] = value
ret.update(cross_signing_keys)
return ret