diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-09-02 11:47:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 11:47:26 +0100 |
| commit | abeab964d5a0cc41fa421cf9d89dc12b7a796391 (patch) | |
| tree | 02433188ace90fdb6fab8ac9552c3d9eb5f16064 /synapse/storage/databases/main/devices.py | |
| parent | Fix errors when updating the user directory with invalid data (#8223) (diff) | |
| download | synapse-abeab964d5a0cc41fa421cf9d89dc12b7a796391.tar.xz | |
Make _get_e2e_device_keys_and_signatures_txn return an attrs (#8224)
this makes it a bit clearer what's going on.
Diffstat (limited to 'synapse/storage/databases/main/devices.py')
| -rw-r--r-- | synapse/storage/databases/main/devices.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py index 11956cc48e..8bedcdbdff 100644 --- a/synapse/storage/databases/main/devices.py +++ b/synapse/storage/databases/main/devices.py @@ -293,17 +293,17 @@ class DeviceWorkerStore(SQLBaseStore): prev_id = stream_id if device is not None: - key_json = device.get("key_json", None) + key_json = device.key_json if key_json: result["keys"] = db_to_json(key_json) - if "signatures" in device: - for sig_user_id, sigs in device["signatures"].items(): + if device.signatures: + for sig_user_id, sigs in device.signatures.items(): result["keys"].setdefault("signatures", {}).setdefault( sig_user_id, {} ).update(sigs) - device_display_name = device.get("device_display_name", None) + device_display_name = device.display_name if device_display_name: result["device_display_name"] = device_display_name else: |