Pass the origin when calculating the spaces summary over GET. (#10079)

clokep · web-flow · commit 8e15c92c2f9e · 2021-05-27T08:52:28.000-04:00
Fixes a bug due to conflicting PRs which were merged. (One added a new caller to
a method, the other added a new parameter to the same method.)
diff --git a/changelog.d/10079.bugfix b/changelog.d/10079.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request.
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
@@ -1398,7 +1398,7 @@ async def on_GET(
                 )
 
         return 200, await self.handler.federation_space_summary(
-            room_id, suggested_only, max_rooms_per_space, exclude_rooms
+            origin, room_id, suggested_only, max_rooms_per_space, exclude_rooms
         )
 
     # TODO When switching to the stable endpoint, remove the POST handler.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request.`
Original file line number	Diff line number	Diff line change
`@@ -1398,7 +1398,7 @@ async def on_GET(`
`1398`	`1398`	`)`
`1399`	`1399`
`1400`	`1400`	`return 200, await self.handler.federation_space_summary(`
`1401`		`- room_id, suggested_only, max_rooms_per_space, exclude_rooms`
	`1401`	`+ origin, room_id, suggested_only, max_rooms_per_space, exclude_rooms`
`1402`	`1402`	`)`
`1403`	`1403`
`1404`	`1404`	`# TODO When switching to the stable endpoint, remove the POST handler.`