summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-23 17:04:26 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-23 17:04:26 +0000
commit61f50aec4adb0971f500c6ce19e31bb863567c98 (patch)
tree4cdf3c3d8e01b70f7cb13a94f2e216183941df50 /synapse/federation/transport/server.py
parent1.10.0rc1 (diff)
parentFix `room_version` in `on_invite_request` flow (#6827) (diff)
downloadsynapse-61f50aec4adb0971f500c6ce19e31bb863567c98.tar.xz
Fix `room_version` in `on_invite_request` flow (#6827)
* commit 'b0d112e78':
  Fix `room_version` in `on_invite_request` flow (#6827)
  Update changelog
  Fix link in upgrade.rst
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r--synapse/federation/transport/server.py4
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