From 8e15c92c2f9e581e59ff68495fa99e998849bb4d Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Thu, 27 May 2021 08:52:28 -0400
Subject: [PATCH] Pass the origin when calculating the spaces summary over GET.
(#10079)
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.)
---
changelog.d/10079.bugfix | 1 +
synapse/federation/transport/server.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 changelog.d/10079.bugfix
diff --git a/changelog.d/10079.bugfix b/changelog.d/10079.bugfix
new file mode 100644
index 0000000000..2b93c4534a
--- /dev/null
+++ 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
index 9d50b05d01..40eab45549 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -1398,7 +1398,7 @@ class FederationSpaceSummaryServlet(BaseFederationServlet):
)
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.
--
GitLab