summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-03-25 16:38:05 +0000
committerGitHub <noreply@github.com>2019-03-25 16:38:05 +0000
commit9bde730ef821a20f6a785813b19953a9ba187ce7 (patch)
tree6b86286e597c30f73665326d08c9761add0f5978 /synapse/storage
parentUse an explicit dbname for postgres connections in the tests. (#4928) (diff)
downloadsynapse-9bde730ef821a20f6a785813b19953a9ba187ce7.tar.xz
Fix bug where read-receipts lost their timestamps (#4927)
Make sure that they are sent correctly over the replication stream.

Fixes: #4898
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/receipts.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py
index 0fd1ccc40a..89a1f7e3d7 100644
--- a/synapse/storage/receipts.py
+++ b/synapse/storage/receipts.py
@@ -301,7 +301,9 @@ class ReceiptsWorkerStore(SQLBaseStore):
                 args.append(limit)
             txn.execute(sql, args)
 
-            return txn.fetchall()
+            return (
+                r[0:5] + (json.loads(r[5]), ) for r in txn
+            )
         return self.runInteraction(
             "get_all_updated_receipts", get_all_updated_receipts_txn
         )