summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2020-06-15 13:42:44 -0400
committerGitHub <noreply@github.com>2020-06-15 13:42:44 -0400
commit2b2344652b215b8023fb37deeacbb395f3c68d7c (patch)
tree1a854996e701b379fde25e23e8a07460fb1dcc6e /synapse
parentUpdate m.id.phone to use 'phone' instead of 'number' (#7687) (diff)
downloadsynapse-2b2344652b215b8023fb37deeacbb395f3c68d7c.tar.xz
Ensure etag is a string for GET room_keys/version response (#7691)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/e2e_room_keys.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/e2e_room_keys.py b/synapse/handlers/e2e_room_keys.py
index 2efea801bc..f55470a707 100644
--- a/synapse/handlers/e2e_room_keys.py
+++ b/synapse/handlers/e2e_room_keys.py
@@ -349,6 +349,7 @@ class E2eRoomKeysHandler(object):
                     raise
 
             res["count"] = yield self.store.count_e2e_room_keys(user_id, res["version"])
+            res["etag"] = str(res["etag"])
             return res
 
     @trace