diff options
| author | Erik Johnston <erik@matrix.org> | 2019-04-17 19:44:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-04-17 19:44:40 +0100 |
| commit | ca90336a6935b36b5761244005b0f68b496d5d79 (patch) | |
| tree | 6bbce5eafc0db3b24ccc3b59b051da850382ae09 /synapse/handlers/federation.py | |
| parent | Add management endpoints for account validity (diff) | |
| parent | Merge pull request #5047 from matrix-org/babolivier/account_expiration (diff) | |
| download | synapse-ca90336a6935b36b5761244005b0f68b496d5d79.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/account_expiration
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 9eaf2d3e18..0684778882 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -29,13 +29,7 @@ from unpaddedbase64 import decode_base64 from twisted.internet import defer -from synapse.api.constants import ( - KNOWN_ROOM_VERSIONS, - EventTypes, - Membership, - RejectedReason, - RoomVersions, -) +from synapse.api.constants import EventTypes, Membership, RejectedReason from synapse.api.errors import ( AuthError, CodeMessageException, @@ -44,6 +38,7 @@ from synapse.api.errors import ( StoreError, SynapseError, ) +from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersions from synapse.crypto.event_signing import compute_event_signature from synapse.event_auth import auth_types_for_event from synapse.events.validator import EventValidator @@ -1733,7 +1728,9 @@ class FederationHandler(BaseHandler): # invalid, and it would fail auth checks anyway. raise SynapseError(400, "No create event in state") - room_version = create_event.content.get("room_version", RoomVersions.V1) + room_version = create_event.content.get( + "room_version", RoomVersions.V1.identifier, + ) missing_auth_events = set() for e in itertools.chain(auth_events, state, [event]): |