diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-25 15:59:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 15:59:36 +0000 |
| commit | b6dce9b9fde07d450e22da479108b2859d3bd49d (patch) | |
| tree | 13f3757fc0ad20bbf297830918b616da41ca3f1f /synapse/replication/http/federation.py | |
| parent | Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsert (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-b6dce9b9fde07d450e22da479108b2859d3bd49d.tar.xz | |
Merge pull request #4470 from matrix-org/erikj/require_format_version
Require event format version to parse or create events
Diffstat (limited to 'synapse/replication/http/federation.py')
| -rw-r--r-- | synapse/replication/http/federation.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/replication/http/federation.py b/synapse/replication/http/federation.py index 64a79da162..2e16c69666 100644 --- a/synapse/replication/http/federation.py +++ b/synapse/replication/http/federation.py @@ -17,7 +17,7 @@ import logging from twisted.internet import defer -from synapse.events import FrozenEvent +from synapse.events import event_type_from_format_version from synapse.events.snapshot import EventContext from synapse.http.servlet import parse_json_object_from_request from synapse.replication.http._base import ReplicationEndpoint @@ -70,6 +70,7 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): event_payloads.append({ "event": event.get_pdu_json(), + "event_format_version": event.format_version, "internal_metadata": event.internal_metadata.get_dict(), "rejected_reason": event.rejected_reason, "context": serialized_context, @@ -94,9 +95,12 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): event_and_contexts = [] for event_payload in event_payloads: event_dict = event_payload["event"] + format_ver = content["event_format_version"] internal_metadata = event_payload["internal_metadata"] rejected_reason = event_payload["rejected_reason"] - event = FrozenEvent(event_dict, internal_metadata, rejected_reason) + + EventType = event_type_from_format_version(format_ver) + event = EventType(event_dict, internal_metadata, rejected_reason) context = yield EventContext.deserialize( self.store, event_payload["context"], |