diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-02-03 13:15:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 13:15:23 +0000 |
| commit | b0d112e78b96168852260b3986d348ae3a98292f (patch) | |
| tree | 3971851245b03ce5b56c42da1f05c3a3f319ae5a /synapse/federation/transport | |
| parent | Update changelog (diff) | |
| download | synapse-b0d112e78b96168852260b3986d348ae3a98292f.tar.xz | |
Fix `room_version` in `on_invite_request` flow (#6827)
I messed this up a bit in #6805, but fortunately we weren't actually doing anything with the room_version so it didn't matter that it was a str not a RoomVersion.
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 125eadd796..ae48ba8157 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -579,7 +579,7 @@ class FederationV1InviteServlet(BaseFederationServlet): # state resolution algorithm, and we don't use that for processing # invites content = await self.handler.on_invite_request( - origin, content, room_version=RoomVersions.V1.identifier + origin, content, room_version_id=RoomVersions.V1.identifier ) # V1 federation API is defined to return a content of `[200, {...}]` @@ -606,7 +606,7 @@ class FederationV2InviteServlet(BaseFederationServlet): event.setdefault("unsigned", {})["invite_room_state"] = invite_room_state content = await self.handler.on_invite_request( - origin, event, room_version=room_version + origin, event, room_version_id=room_version ) return 200, content |