diff options
author | Andrej Shadura <andrewsh@debian.org> | 2020-02-22 11:02:03 +0300 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2020-02-22 11:02:03 +0300 |
commit | 4b3a9670d149fa9e5ccd8427af01c91cb657fbf7 (patch) | |
tree | 8f5e13c25ee10726c9351dea0dfcf2bcf6657a82 /synapse/events/builder.py | |
parent | cd4f94423a6b511d504e0c792d6644973f505d71 (diff) |
New upstream version 1.11.0
Diffstat (limited to 'synapse/events/builder.py')
-rw-r--r-- | synapse/events/builder.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/synapse/events/builder.py b/synapse/events/builder.py index 8d63ad6d..a0c4a40c 100644 --- a/synapse/events/builder.py +++ b/synapse/events/builder.py @@ -28,11 +28,7 @@ from synapse.api.room_versions import ( RoomVersion, ) from synapse.crypto.event_signing import add_hashes_and_signatures -from synapse.events import ( - EventBase, - _EventInternalMetadata, - event_type_from_format_version, -) +from synapse.events import EventBase, _EventInternalMetadata, make_event_from_dict from synapse.types import EventID, JsonDict from synapse.util import Clock from synapse.util.stringutils import random_string @@ -256,8 +252,8 @@ def create_local_event_from_event_dict( event_dict.setdefault("signatures", {}) add_hashes_and_signatures(room_version, event_dict, hostname, signing_key) - return event_type_from_format_version(format_version)( - event_dict, internal_metadata_dict=internal_metadata_dict + return make_event_from_dict( + event_dict, room_version, internal_metadata_dict=internal_metadata_dict ) |