summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-17 10:29:23 +0000
committerErik Johnston <erik@matrix.org>2014-11-17 10:29:23 +0000
commit8c45c8b8b98c5a0e98bf4051994fed9847aadd08 (patch)
tree12c7ac945749c68b81e3ae55c39dfd58ae824bf0 /synapse/storage
parentMove getLastMessage to modelService. (diff)
parentMerge remote-tracking branch 'origin/develop' into merge_pdu_event_objects (diff)
downloadsynapse-8c45c8b8b98c5a0e98bf4051994fed9847aadd08.tar.xz
Merge pull request #14 from matrix-org/merge_pdu_event_objects
Merge pdu and event objects
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/_base.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 30e6eac8db..5d4be09a82 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -492,6 +492,14 @@ class SQLBaseStore(object):
                 for n, s in signatures.items()
             }
 
+            hashes = self._get_event_content_hashes_txn(
+                txn, ev.event_id,
+            )
+
+            ev.hashes = {
+                k: encode_base64(v) for k, v in hashes.items()
+            }
+
             prevs = self._get_prev_events_and_state(txn, ev.event_id)
 
             ev.prev_events = [