diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-05 16:20:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-05 16:20:48 +0000 |
| commit | 6630e1b5795667fd947cc5b0d5d2b00da97325e3 (patch) | |
| tree | ce141a61defe211cac454a5953106f6e351fe260 /synapse/storage/_base.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor (diff) | |
| download | synapse-6630e1b5795667fd947cc5b0d5d2b00da97325e3.tar.xz | |
Start making more things use EventContext rather than event.*
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index bb61c20150..c56c3a0b0f 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -15,7 +15,8 @@ import logging from synapse.api.errors import StoreError -from synapse.api.events.utils import prune_event +from synapse.events import FrozenEvent +from synapse.events.utils import prune_event from synapse.util.logutils import log_function from synapse.util.logcontext import PreserveLoggingContext, LoggingContext from syutil.base64util import encode_base64 @@ -497,10 +498,7 @@ class SQLBaseStore(object): d = json.loads(js) - ev = self.event_factory.create_event( - etype=d["type"], - **d - ) + ev = FrozenEvent(d) if hasattr(ev, "redacted") and ev.redacted: # Get the redaction event. |