diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-25 15:59:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 15:59:36 +0000 |
| commit | b6dce9b9fde07d450e22da479108b2859d3bd49d (patch) | |
| tree | 13f3757fc0ad20bbf297830918b616da41ca3f1f /synapse/federation/transport/server.py | |
| parent | Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsert (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-b6dce9b9fde07d450e22da479108b2859d3bd49d.tar.xz | |
Merge pull request #4470 from matrix-org/erikj/require_format_version
Require event format version to parse or create events
Diffstat (limited to 'synapse/federation/transport/server.py')
| -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)) |