summary refs log tree commit diff
path: root/synapse/rest/client/relations.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2024-02-06 15:27:17 +0000
committerErik Johnston <erik@matrix.org>2024-02-06 15:27:17 +0000
commitf7a8fafbc1c13c930686f9d8feaaa03a56a67553 (patch)
tree12132265317205cca849c95283c3284cb016b8e3 /synapse/rest/client/relations.py
parentMerge branch 'release-v1.100' into matrix-org-hotfixes (diff)
parentAccept unprefixed form of MSC3981 recurse parameter (#16842) (diff)
downloadsynapse-f7a8fafbc1c13c930686f9d8feaaa03a56a67553.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/relations.py')
-rw-r--r--synapse/rest/client/relations.py2
1 files changed, 1 insertions, 1 deletions
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: