Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-18 07:04:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

keys/query: Omit device displayname if null

Browse Source 
... which makes it more consistent with user displaynames.
This commit is contained in:
Richard van der Hoff 2016-08-04 10:59:51 +01:00
parent 05e3354047
commit f131cd9e53
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/e2e_keys.py
View File

@ -122,9 +122,10 @@ class E2eKeysHandler(object):
for user_id, device_keys in results.items(): for user_id, device_keys in results.items():
for device_id, device_info in device_keys.items(): for device_id, device_info in device_keys.items():
r = json.loads(device_info["key_json"]) r = json.loads(device_info["key_json"])
r["unsigned"] = { r["unsigned"] = {}
"device_display_name": device_info["device_display_name"], display_name = device_info["device_display_name"]
} if display_name is not None:
r["unsigned"]["device_display_name"] = display_name
result_dict[user_id][device_id] = r result_dict[user_id][device_id] = r
defer.returnValue(result_dict) defer.returnValue(result_dict)