diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-08 17:10:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 17:10:53 +0100 |
| commit | 8521ae13e33301e06eb1fb5b36a8eef4e7f6453f (patch) | |
| tree | fa2749c97eb5ada93e0d7dd620e429b19d00664f /synapse/handlers/federation.py | |
| parent | Merge pull request #3662 from matrix-org/neilj/reserved_users (diff) | |
| parent | Don't expose default_room_version as config opt (diff) | |
| download | synapse-8521ae13e33301e06eb1fb5b36a8eef4e7f6453f.tar.xz | |
Merge pull request #3654 from matrix-org/rav/room_versions
Support for room versioning
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 533b82c783..0dffd44e22 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -30,7 +30,12 @@ from unpaddedbase64 import decode_base64 from twisted.internet import defer -from synapse.api.constants import EventTypes, Membership, RejectedReason +from synapse.api.constants import ( + KNOWN_ROOM_VERSIONS, + EventTypes, + Membership, + RejectedReason, +) from synapse.api.errors import ( AuthError, CodeMessageException, @@ -922,6 +927,9 @@ class FederationHandler(BaseHandler): joinee, "join", content, + params={ + "ver": KNOWN_ROOM_VERSIONS, + }, ) # This shouldn't happen, because the RoomMemberHandler has a @@ -1187,13 +1195,14 @@ class FederationHandler(BaseHandler): @defer.inlineCallbacks def _make_and_verify_event(self, target_hosts, room_id, user_id, membership, - content={},): + content={}, params=None): origin, pdu = yield self.federation_client.make_membership_event( target_hosts, room_id, user_id, membership, content, + params=params, ) logger.debug("Got response to make_%s: %s", membership, pdu) |