summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2024-02-06 09:48:39 +0000
committerGitHub <noreply@github.com>2024-02-06 09:48:39 +0000
commit71ca199165f8ec8d49691979628c1da2ebda9b4d (patch)
tree0d141a22710ad54cb6b9b7f08c51a4a8240bd665
parentBump lxml-stubs from 0.4.0 to 0.5.1 (#16885) (diff)
downloadsynapse-71ca199165f8ec8d49691979628c1da2ebda9b4d.tar.xz
Accept unprefixed form of MSC3981 recurse parameter (#16842)
Now that the MSC3981 has passed FCP
-rw-r--r--changelog.d/16842.misc1
-rw-r--r--synapse/rest/client/relations.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/16842.misc b/changelog.d/16842.misc
new file mode 100644
index 0000000000..022ace7d95
--- /dev/null
+++ b/changelog.d/16842.misc
@@ -0,0 +1 @@
+Add support for stabilised [MSC3981](https://github.com/matrix-org/matrix-spec-proposals/pull/3981) that adds a `recurse` parameter on the `/relations` API.
diff --git a/synapse/rest/client/relations.py b/synapse/rest/client/relations.py
index e8dfeaa543..42da017f37 100644
--- a/synapse/rest/client/relations.py
+++ b/synapse/rest/client/relations.py
@@ -71,7 +71,7 @@ class RelationPaginationServlet(RestServlet):
             self._store, request, default_limit=5, default_dir=Direction.BACKWARDS
         )
         if self._support_recurse:
-            recurse = parse_boolean(
+            recurse = parse_boolean(request, "recurse", default=False) or parse_boolean(
                 request, "org.matrix.msc3981.recurse", default=False
             )
         else: