diff options
author | Erik Johnston <erikj@jki.re> | 2019-01-25 10:23:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-25 10:23:51 +0000 |
commit | be6a7e47fa75d72466a356c254376b8eb0707bb2 (patch) | |
tree | 08902e6b1564b865a5b21194c844d85a693ef095 /synapse/federation/transport | |
parent | Merge pull request #4451 from matrix-org/erikj/require_format_version (diff) | |
download | synapse-be6a7e47fa75d72466a356c254376b8eb0707bb2.tar.xz |
Revert "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 67ae0212c3..4557a9e66e 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, room_id) + content = yield self.handler.on_send_leave_request(origin, content) 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, context) + content = yield self.handler.on_send_join_request(origin, content) defer.returnValue((200, content)) |