diff options
author | Erik Johnston <erikj@jki.re> | 2019-01-29 22:54:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-29 22:54:25 +0000 |
commit | 7740eddd04504af1f60a96dda08d01904a238e0b (patch) | |
tree | 4cc0284a797c9d240c10b8d4912bba1132ff289c /synapse/events | |
parent | Merge pull request #4483 from matrix-org/erikj/event_v2 (diff) | |
parent | Update comment (diff) | |
download | synapse-7740eddd04504af1f60a96dda08d01904a238e0b.tar.xz |
Merge pull request #4514 from matrix-org/erikj/remove_event_id
Remove usages of event ID's domain
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", |