summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-05-23 11:18:13 +0100
committerGitHub <noreply@github.com>2017-05-23 11:18:13 +0100
commitfbbc40f38572a744668e9438b61ab0ef86cf4c62 (patch)
tree0a89db32d7ffec1d0c9daf8598e3e09ffe4d9b07 /synapse/rest
parentMerge pull request #2242 from matrix-org/erikj/email_refactor (diff)
parentRemove redundant invalidation (diff)
downloadsynapse-fbbc40f38572a744668e9438b61ab0ef86cf4c62.tar.xz
Merge pull request #2237 from matrix-org/erikj/sync_key_count
Add count of one time keys to sync stream
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 771e127ab9..83e209d18f 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -192,6 +192,7 @@ class SyncRestServlet(RestServlet):
                 "invite": invited,
                 "leave": archived,
             },
+            "device_one_time_keys_count": sync_result.device_one_time_keys_count,
             "next_batch": sync_result.next_batch.to_string(),
         }