diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-26 23:25:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-26 23:25:17 +0100 |
| commit | d42455cdc99d2ee71b03b14376f4acf407902e2f (patch) | |
| tree | ce94abaf7975caacdae1ef8e794f99f035eaf5c0 | |
| parent | Merge pull request #3614 from matrix-org/rav/stop_populating_event_content (diff) | |
| parent | Create 3616.misc (diff) | |
| download | synapse-d42455cdc99d2ee71b03b14376f4acf407902e2f.tar.xz | |
Merge pull request #3616 from matrix-org/travis/event_id_send_leave
Update the send_leave path to be an event_id
| -rw-r--r-- | changelog.d/3616.misc | 1 | ||||
| -rw-r--r-- | synapse/federation/transport/server.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/3616.misc b/changelog.d/3616.misc new file mode 100644 index 0000000000..04629faa36 --- /dev/null +++ b/changelog.d/3616.misc @@ -0,0 +1 @@ +Update the /send_leave path registration to use event_id rather than a transaction ID. diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index c9beca27c2..8574898f0c 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -404,10 +404,10 @@ class FederationMakeLeaveServlet(BaseFederationServlet): class FederationSendLeaveServlet(BaseFederationServlet): - PATH = "/send_leave/(?P<room_id>[^/]*)/(?P<txid>[^/]*)" + PATH = "/send_leave/(?P<room_id>[^/]*)/(?P<event_id>[^/]*)" @defer.inlineCallbacks - def on_PUT(self, origin, content, query, room_id, txid): + def on_PUT(self, origin, content, query, room_id, event_id): content = yield self.handler.on_send_leave_request(origin, content) defer.returnValue((200, content)) |