diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-29 22:58:38 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-29 22:58:38 +0000 |
| commit | 67b82f133631879244773421988d52b1eb626d78 (patch) | |
| tree | b62b1658804c8f76cde6f5a9d24e7aff3af56438 /synapse/events | |
| parent | Fixup comment (diff) | |
| parent | Merge pull request #4514 from matrix-org/erikj/remove_event_id (diff) | |
| download | synapse-67b82f133631879244773421988d52b1eb626d78.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/validator.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/events/validator.py b/synapse/events/validator.py index c53bf44e51..a072674b02 100644 --- a/synapse/events/validator.py +++ b/synapse/events/validator.py @@ -15,7 +15,7 @@ from six import string_types -from synapse.api.constants import EventTypes, Membership +from synapse.api.constants import EventFormatVersions, EventTypes, Membership from synapse.api.errors import SynapseError from synapse.types import EventID, RoomID, UserID @@ -29,7 +29,8 @@ class EventValidator(object): """ self.validate_builder(event) - EventID.from_string(event.event_id) + if event.format_version == EventFormatVersions.V1: + EventID.from_string(event.event_id) required = [ "auth_events", |