summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-12-03 16:19:21 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2015-12-03 16:19:21 +0000
commitedfcb83473fa4af4ecd34884c780774aa5c5184a (patch)
treea758ee2ad46086047f46f0e398961d997f31305e /synapse/handlers
parentMerge pull request #414 from matrix-org/erikj/if_not_exists (diff)
downloadsynapse-edfcb83473fa4af4ecd34884c780774aa5c5184a.tar.xz
Flatten devices into a dict, not a list
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/admin.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/handlers/admin.py b/synapse/handlers/admin.py

index 5ba3c7039a..04fa58df65 100644 --- a/synapse/handlers/admin.py +++ b/synapse/handlers/admin.py
@@ -42,16 +42,15 @@ class AdminHandler(BaseHandler): ret = { "user_id": user.to_string(), - "devices": [ - { - "device_id": None, + "devices": { + "": { "sessions": [ { "connections": connections, } ] }, - ], + }, } defer.returnValue(ret)