Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix room_version in on_invite_request flow #6827

Merged
merged 1 commit into from
Feb 3, 2020
Merged

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jan 31, 2020

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.

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.
@richvdh richvdh requested a review from a team February 3, 2020 12:54
@richvdh
Copy link
Member Author

richvdh commented Feb 3, 2020

For clarity on this: there are two methods called on_invite_request: one in FederationServer, and the other in FederationHandler. The former is called by the Federation*InviteServlet classes, and delegates to the latter.

The InviteServlets pass in a str, and, prior to this PR, FederationServer passed it straight through, despite FederationHandler expecting a RoomVersion. This PR modifies FederationServer to pass a RoomVersion instead, and also updates the parameter name to reflect the fact it wants a str.

@richvdh richvdh merged commit b0d112e into develop Feb 3, 2020
@richvdh richvdh deleted the rav/redact_changes/4.1 branch February 3, 2020 13:15
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit 'b0d112e78':
  Fix `room_version` in `on_invite_request` flow (#6827)
  Update changelog
  Fix link in upgrade.rst
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants