summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-02-23 10:27:06 +0000
committerErik Johnston <erik@matrix.org>2018-02-23 10:27:06 +0000
commit185740f887a2e1ea2ffe468dfa42d3e08a61c5a8 (patch)
treecd6f24b07498ee3b41c5e55ad5032012dad2809e /synapse/storage
parentMerge pull request #2893 from matrix-org/erikj/delete_from_staging_fed (diff)
downloadsynapse-github/erikj/compact_event.tar.xz
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/events.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py

index 73177e0bc2..9bc58734a3 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py
@@ -16,7 +16,7 @@ from ._base import SQLBaseStore from twisted.internet import defer, reactor -from synapse.events import FrozenEvent, USE_FROZEN_DICTS +from synapse.events import CompactEvent, FrozenEvent, USE_FROZEN_DICTS from synapse.events.utils import prune_event from synapse.util.async import ObservableDeferred @@ -1310,7 +1310,7 @@ class EventsStore(SQLBaseStore): event = ev_map[row["event_id"]] if not row["rejects"] and not row["redacts"]: to_prefill.append(_EventCacheEntry( - event=event, + event=CompactEvent.from_event(event), redacted_event=None, )) @@ -1653,7 +1653,7 @@ class EventsStore(SQLBaseStore): redacted_event.unsigned["redacted_because"] = because cache_entry = _EventCacheEntry( - event=original_ev, + event=CompactEvent.from_event(original_ev), redacted_event=redacted_event, )