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

make storage layer in charge of interpreting the device key data

Browse source
This commit is contained in:
Hubert Chathi 2019-10-10 15:56:00 -04:00
parent def5413480
commit 4908fb3b30
3 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
synapse/storage/end_to_end_keys.py
View file

@ -40,7 +40,7 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
This option only takes effect if include_all_devices is true.
Returns:
Dict mapping from user-id to dict mapping from device_id to
dict containing "key_json", "device_display_name".
key data.
"""
set_tag("query_list", query_list)
if not query_list:
@ -54,9 +54,16 @@ class EndToEndKeyWorkerStore(SQLBaseStore):
include_deleted_devices,
)
# Build the result structure, un-jsonify the results, and add the
# "unsigned" section
for user_id, device_keys in iteritems(results):
for device_id, device_info in iteritems(device_keys):
device_info["keys"] = db_to_json(device_info.pop("key_json"))
r = db_to_json(device_info.pop("key_json"))
r["unsigned"] = {}
display_name = device_info["device_display_name"]
if display_name is not None:
r["unsigned"]["device_display_name"] = display_name
results[user_id][device_id] = r
return results