diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-23 20:21:33 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-23 20:21:33 +0000 |
commit | f431ff3fb82cb3da549f92d8aef704bbf58387b6 (patch) | |
tree | 8e3ecbec9e8f656aaed1bc4642ad000f11816302 /synapse/federation/transport | |
parent | Merge branch 'erikj/fixup_rejecting_invites' of github.com:matrix-org/synapse... (diff) | |
download | synapse-f431ff3fb82cb3da549f92d8aef704bbf58387b6.tar.xz |
Require event format version to parse or create events
Diffstat (limited to 'synapse/federation/transport')
-rw-r--r-- | synapse/federation/transport/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 4557a9e66e..67ae0212c3 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -469,7 +469,7 @@ class FederationSendLeaveServlet(BaseFederationServlet): @defer.inlineCallbacks def on_PUT(self, origin, content, query, room_id, event_id): - content = yield self.handler.on_send_leave_request(origin, content) + content = yield self.handler.on_send_leave_request(origin, content, room_id) defer.returnValue((200, content)) @@ -487,7 +487,7 @@ class FederationSendJoinServlet(BaseFederationServlet): def on_PUT(self, origin, content, query, context, event_id): # TODO(paul): assert that context/event_id parsed from path actually # match those given in content - content = yield self.handler.on_send_join_request(origin, content) + content = yield self.handler.on_send_join_request(origin, content, context) defer.returnValue((200, content)) |