Merge branch 'desktop'

1 files changed, 29 insertions, 0 deletions

diff --git a/packages/overlays/matrix-synapse/patches/0033-Use-parse_boolean-for-unredacted-content.patch b/packages/overlays/matrix-synapse/patches/0033-Use-parse_boolean-for-unredacted-content.patch
new file mode 100644

index 0000000..93567d4
--- /dev/null
+++ b/packages/overlays/matrix-synapse/patches/0033-Use-parse_boolean-for-unredacted-content.patch
@@ -0,0 +1,29 @@
+From 22d37c310c09dcc65f118cc3d39bda0a65507759 Mon Sep 17 00:00:00 2001
+From: Rory& <root@rory.gay>
+Date: Tue, 27 May 2025 06:14:26 +0200
+Subject: [PATCH 33/34] Use parse_boolean for unredacted content
+
+---
+ synapse/rest/client/room.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py
+index 03e7bc0a24..725b2162fd 100644
+--- a/synapse/rest/client/room.py
++++ b/synapse/rest/client/room.py
+@@ -894,10 +894,9 @@ class RoomEventServlet(RestServlet):
+         requester = await self.auth.get_user_by_req(request, allow_guest=True)
+ 
+         include_unredacted_content = self.msc2815_enabled and (
+-            parse_string(
++            parse_boolean(
+                 request,
+-                "fi.mau.msc2815.include_unredacted_content",
+-                allowed_values=("true", "false"),
++                "fi.mau.msc2815.include_unredacted_content"
+             )
+             == "true"
+         )
+-- 
+2.49.0
+