summary refs log tree commit diff
path: root/packages/overlays/matrix-synapse
diff options
context:
space:
mode:
Diffstat (limited to 'packages/overlays/matrix-synapse')
-rw-r--r--packages/overlays/matrix-synapse/patches/0001-nix-use-postgres-17.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0004-nix-Temporarily-disable-go-in-flake.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0006-Fix-gitignore-to-ignore-.venv.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0008-Add-too-much-logging-to-room-summary-over-federation.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0009-Log-entire-room-if-accessibility-check-fails.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0013-fix-Always-recheck-messages-pagination-data-if-a-bac.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0016-Clarify-pre_event_ids-assert-in-event-creation-handl.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch18
-rw-r--r--packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch6
-rw-r--r--packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch6
-rw-r--r--packages/overlays/matrix-synapse/patches/0020-max-and-min-were-probably-switched.-Set-max-to-arbit.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0021-changelog.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0023-Adjust-for-the-retry-interval-actually-being-a-timeo.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0024-unecessarily-long-pump-in-test-left-over-from-testin.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch4
25 files changed, 65 insertions, 65 deletions
diff --git a/packages/overlays/matrix-synapse/patches/0001-nix-use-postgres-17.patch b/packages/overlays/matrix-synapse/patches/0001-nix-use-postgres-17.patch

index 7e079b6..64e554b 100644 --- a/packages/overlays/matrix-synapse/patches/0001-nix-use-postgres-17.patch +++ b/packages/overlays/matrix-synapse/patches/0001-nix-use-postgres-17.patch
@@ -1,4 +1,4 @@ -From 0710094b06b2b3eaad8212d24edd10066648cb17 Mon Sep 17 00:00:00 2001 +From 1bcec5a1e035e7294d16f4de7cccd25de09fb40a Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Fri, 25 Jul 2025 08:25:28 +0200 Subject: [PATCH 01/25] nix: use postgres 17 @@ -21,5 +21,5 @@ index 4ff6518aed..51ae12c272 100644 # On the first invocation of `devenv up`, create a database for # Synapse to store data in. -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch b/packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch
index 014d2f5..b0258c3 100644 --- a/packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch +++ b/packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch
@@ -1,4 +1,4 @@ -From 3191ff6411778d266986ada3a68fd90427a9d283 Mon Sep 17 00:00:00 2001 +From caa9828ad8335c75eb0f1699e983dd44efa66b5b Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Mon, 9 Jun 2025 17:38:34 +0200 Subject: [PATCH 02/25] nix: fix flake @@ -186,5 +186,5 @@ index 51ae12c272..cc41490a41 100644 # over the 'synapse' database. services.postgres.initialScript = '' -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch b/packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch
index cd8148f..342f16d 100644 --- a/packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch +++ b/packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch
@@ -1,4 +1,4 @@ -From 7bc7375545daed0571933e2a6063ecb0f78fecf7 Mon Sep 17 00:00:00 2001 +From a858063c19500691e638d368a3f49e02889b315f Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Thu, 13 Nov 2025 13:57:10 +0100 Subject: [PATCH 03/25] nix: Update flake @@ -57,5 +57,5 @@ index cc41490a41..5bde1e6c07 100644 # Rust source code in an IDE (rust-analyzer will also make use of it). extensions = [ "rust-src" ]; -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0004-nix-Temporarily-disable-go-in-flake.patch b/packages/overlays/matrix-synapse/patches/0004-nix-Temporarily-disable-go-in-flake.patch
index ed4e7f5..c814dbf 100644 --- a/packages/overlays/matrix-synapse/patches/0004-nix-Temporarily-disable-go-in-flake.patch +++ b/packages/overlays/matrix-synapse/patches/0004-nix-Temporarily-disable-go-in-flake.patch
@@ -1,4 +1,4 @@ -From ed37b0cde78794056afcae9030e38d97f010336d Mon Sep 17 00:00:00 2001 +From a4aeac60b232762c683ff6d2bfcbe56ae2bc35ee Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Sat, 16 Aug 2025 20:18:45 +0200 Subject: [PATCH 04/25] nix: Temporarily disable go in flake @@ -22,5 +22,5 @@ index 5bde1e6c07..cf7a731f51 100644 # Postgres is needed to run Synapse with postgres support and -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch b/packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch
index 60157ca..ca7d47e 100644 --- a/packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch +++ b/packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch
@@ -1,4 +1,4 @@ -From d5295e735828d424d9217d7127ece66cad177986 Mon Sep 17 00:00:00 2001 +From 5174d4530faf93639c657e58a6a27935986da7b4 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Thu, 13 Nov 2025 13:56:59 +0100 Subject: [PATCH 05/25] Add test script @@ -18,5 +18,5 @@ index 0000000000..1ac82801b2 +#! /usr/bin/env sh +poetry run trial -j`nproc` tests -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0006-Fix-gitignore-to-ignore-.venv.patch b/packages/overlays/matrix-synapse/patches/0006-Fix-gitignore-to-ignore-.venv.patch
index 1722347..f48c410 100644 --- a/packages/overlays/matrix-synapse/patches/0006-Fix-gitignore-to-ignore-.venv.patch +++ b/packages/overlays/matrix-synapse/patches/0006-Fix-gitignore-to-ignore-.venv.patch
@@ -1,4 +1,4 @@ -From 93af91e5d4eb59c8f1a55d5d3f86746d9728d28a Mon Sep 17 00:00:00 2001 +From 18b97cfb2401d3c5325250dbf6c339ef873cd515 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Mon, 9 Jun 2025 17:46:10 +0200 Subject: [PATCH 06/25] Fix gitignore to ignore .venv @@ -21,5 +21,5 @@ index e333f2320b..3aec96e75e 100644 /logs /media_store/ -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch b/packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch
index 1891da7..57d382f 100644 --- a/packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch +++ b/packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch
@@ -1,4 +1,4 @@ -From 7bf6dd9744da4eaccf201e62eef243b5e6c95314 Mon Sep 17 00:00:00 2001 +From 4f0166fdae36a7bde86576ce4cac25b9d5ba7a98 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 22 Jul 2025 05:07:01 +0200 Subject: [PATCH 07/25] Fast auth links @@ -97,5 +97,5 @@ index cc7083b605..55a0714f14 100644 txn.execute(sql % (clause,), args) -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0008-Add-too-much-logging-to-room-summary-over-federation.patch b/packages/overlays/matrix-synapse/patches/0008-Add-too-much-logging-to-room-summary-over-federation.patch
index a4cf1fb..d05f91e 100644 --- a/packages/overlays/matrix-synapse/patches/0008-Add-too-much-logging-to-room-summary-over-federation.patch +++ b/packages/overlays/matrix-synapse/patches/0008-Add-too-much-logging-to-room-summary-over-federation.patch
@@ -1,4 +1,4 @@ -From 4d1ba2cb8982f0f72116753da80744947a09f373 Mon Sep 17 00:00:00 2001 +From b52d3a34f03fc5307f44faf3ec85dd73a785bd4e Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Wed, 23 Apr 2025 17:53:52 +0200 Subject: [PATCH 08/25] Add too much logging to room summary over federation @@ -73,5 +73,5 @@ index 9ec0d33f11..5ea32af620 100644 # already be in the room (if it was a child room), or there might be a # pending invite, etc. -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0009-Log-entire-room-if-accessibility-check-fails.patch b/packages/overlays/matrix-synapse/patches/0009-Log-entire-room-if-accessibility-check-fails.patch
index d189ca2..3250311 100644 --- a/packages/overlays/matrix-synapse/patches/0009-Log-entire-room-if-accessibility-check-fails.patch +++ b/packages/overlays/matrix-synapse/patches/0009-Log-entire-room-if-accessibility-check-fails.patch
@@ -1,4 +1,4 @@ -From 521c06d64c7a22bea6db9a78337c53b70c44cbe3 Mon Sep 17 00:00:00 2001 +From 2b3a5ce99695c14ac92c74f17c3ee47ae7d1f93f Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Wed, 23 Apr 2025 18:24:57 +0200 Subject: [PATCH 09/25] Log entire room if accessibility check fails @@ -24,5 +24,5 @@ index 5ea32af620..30ee91cd95 100644 room = dict(room_entry.room) -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch b/packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch
index 7bf9a02..b75501f 100644 --- a/packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch +++ b/packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch
@@ -1,4 +1,4 @@ -From 2fdf69e5d068f20dfaf31097d05f2ba72a8bd374 Mon Sep 17 00:00:00 2001 +From a9ec590c5d767bd833c868eda6490c10396b9bbc Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 05:21:46 +0200 Subject: [PATCH 10/25] Log policy server rejected events @@ -27,5 +27,5 @@ index 0663a36714..d2216978ac 100644 return True # default allow -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch b/packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch
index 0bdfbdf..80ddb8f 100644 --- a/packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch +++ b/packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch
@@ -1,4 +1,4 @@ -From ef028691294d2b6b15af1d2225dd2a777ec28cc4 Mon Sep 17 00:00:00 2001 +From e7ef63ba7d64a1aedb7455ed0e9492397e97b00b Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 06:14:26 +0200 Subject: [PATCH 11/25] Use parse_boolean for unredacted content @@ -9,10 +9,10 @@ Signed-off-by: Rory& <root@rory.gay> 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py -index 5e7dcb0191..dac466f465 100644 +index 9172bfcb4e..07df0bbbee 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py -@@ -1023,10 +1023,9 @@ class RoomEventServlet(RestServlet): +@@ -1050,10 +1050,9 @@ class RoomEventServlet(RestServlet): requester = await self.auth.get_user_by_req(request, allow_guest=True) include_unredacted_content = self.msc2815_enabled and ( @@ -26,5 +26,5 @@ index 5e7dcb0191..dac466f465 100644 == "true" ) -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch b/packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch
index 514f817..0efe0b4 100644 --- a/packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch +++ b/packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch
@@ -1,4 +1,4 @@ -From 94b2da38a5ab6200a7c7bc4a5e50a327f5aa128d Mon Sep 17 00:00:00 2001 +From e3287a79f2164c1966cfbc91138f6f2c8515af0c Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 06:37:52 +0200 Subject: [PATCH 12/25] Expose tombstone in room admin api @@ -34,10 +34,10 @@ index a886859ffa..e97d076a44 100644 response = { diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py -index dac466f465..d28be2befb 100644 +index 07df0bbbee..875890470e 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py -@@ -1027,7 +1027,6 @@ class RoomEventServlet(RestServlet): +@@ -1054,7 +1054,6 @@ class RoomEventServlet(RestServlet): request, "fi.mau.msc2815.include_unredacted_content" ) @@ -111,5 +111,5 @@ index 633df07736..7623208c28 100644 async def get_ratelimit_for_user(self, user_id: str) -> RatelimitOverride | None: """Check if there are any overrides for ratelimiting for the given user -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0013-fix-Always-recheck-messages-pagination-data-if-a-bac.patch b/packages/overlays/matrix-synapse/patches/0013-fix-Always-recheck-messages-pagination-data-if-a-bac.patch
index 535a353..88657d7 100644 --- a/packages/overlays/matrix-synapse/patches/0013-fix-Always-recheck-messages-pagination-data-if-a-bac.patch +++ b/packages/overlays/matrix-synapse/patches/0013-fix-Always-recheck-messages-pagination-data-if-a-bac.patch
@@ -1,4 +1,4 @@ -From 5cd230419f6dc712ad6f0b931f7009f7fe0f0148 Mon Sep 17 00:00:00 2001 +From efb007f59d2b9426b806ad2ed891410a290626e2 Mon Sep 17 00:00:00 2001 From: Jason Little <j.little@famedly.com> Date: Wed, 30 Apr 2025 09:29:42 -0500 Subject: [PATCH 13/25] fix: Always recheck `/messages` pagination data if a @@ -192,5 +192,5 @@ index 7b9c829056..368fa3e007 100644 # Otherwise, we can backfill in the background for eventual # consistency's sake but we don't need to block the client waiting -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch b/packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch
index 89e812e..25cabea 100644 --- a/packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch +++ b/packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch
@@ -1,4 +1,4 @@ -From 4775b12430b2fd8c7487f3779087cd16ece63bf7 Mon Sep 17 00:00:00 2001 +From 2a6a3836c68cdf3aa1841168cb847c552a14110e Mon Sep 17 00:00:00 2001 From: Nicolas Werner <nicolas.werner@hotmail.de> Date: Sun, 8 Jun 2025 23:14:31 +0200 Subject: [PATCH 14/25] Fix pagination with large gaps of rejected events @@ -47,5 +47,5 @@ index 368fa3e007..350c1ccd9e 100644 # we have reached the end of the available events. # In that case we do not return end, to tell the client -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch b/packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch
index 635e1a6..6b43100 100644 --- a/packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch +++ b/packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch
@@ -1,4 +1,4 @@ -From edb8616c493500b52f509a8c27ee2d62ebfae758 Mon Sep 17 00:00:00 2001 +From 5433142126b82a063aa520245386830cbbe78357 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Fri, 25 Jul 2025 08:26:15 +0200 Subject: [PATCH 15/25] RequestRatelimiter: expose can_do_action @@ -92,5 +92,5 @@ index d6cc3d26b5..bdc9481e4f 100644 + n_actions=n_actions, + ) -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0016-Clarify-pre_event_ids-assert-in-event-creation-handl.patch b/packages/overlays/matrix-synapse/patches/0016-Clarify-pre_event_ids-assert-in-event-creation-handl.patch
index ec49b23..3c947d6 100644 --- a/packages/overlays/matrix-synapse/patches/0016-Clarify-pre_event_ids-assert-in-event-creation-handl.patch +++ b/packages/overlays/matrix-synapse/patches/0016-Clarify-pre_event_ids-assert-in-event-creation-handl.patch
@@ -1,4 +1,4 @@ -From dd61c685748369af6e7b46dd55ea4f5b8d4447b7 Mon Sep 17 00:00:00 2001 +From cebfa78c89bd9a89b652fce64dc99fe26df1b6b1 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Sat, 16 Aug 2025 20:19:08 +0200 Subject: [PATCH 16/25] Clarify pre_event_ids assert in event creation handler @@ -9,10 +9,10 @@ Signed-off-by: Rory& <root@rory.gay> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py -index 99ce120736..0c7bf8b4d1 100644 +index eb01622515..65782dc459 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py -@@ -1274,7 +1274,7 @@ class EventCreationHandler: +@@ -1285,7 +1285,7 @@ class EventCreationHandler: if state_event_ids is not None: # Do a quick check to make sure that prev_event_ids is present to # make the type-checking around `builder.build` happy. @@ -22,5 +22,5 @@ index 99ce120736..0c7bf8b4d1 100644 temp_event = await builder.build( prev_event_ids=prev_event_ids, -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch b/packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch
index 04f7835..7941117 100644 --- a/packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch +++ b/packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch
@@ -1,4 +1,4 @@ -From a96f2eb4361749a083b0c8a49068af8154333232 Mon Sep 17 00:00:00 2001 +From ac2d85fc125811f2d6d9f302ed30e2f96fc4491e Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Sat, 26 Jul 2025 09:50:56 +0200 Subject: [PATCH 17/25] Add bulk send events endpoint @@ -16,7 +16,7 @@ Signed-off-by: Rory& <root@rory.gay> 2 files changed, 114 insertions(+), 1 deletion(-) diff --git a/synapse/rest/client/capabilities.py b/synapse/rest/client/capabilities.py -index baff999ab0..5a85a415e6 100644 +index 705d74dee1..075c3de261 100644 --- a/synapse/rest/client/capabilities.py +++ b/synapse/rest/client/capabilities.py @@ -74,6 +74,9 @@ class CapabilitiesRestServlet(RestServlet): @@ -30,7 +30,7 @@ index baff999ab0..5a85a415e6 100644 } diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py -index d28be2befb..7bcfdb68ce 100644 +index 875890470e..67820f706e 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -23,10 +23,12 @@ @@ -46,7 +46,7 @@ index d28be2befb..7bcfdb68ce 100644 import attr from prometheus_client.core import Histogram -@@ -45,6 +47,7 @@ from synapse.api.errors import ( +@@ -51,6 +53,7 @@ from synapse.api.errors import ( UnredactedContentDeletedError, ) from synapse.api.filtering import Filter @@ -54,7 +54,7 @@ index d28be2befb..7bcfdb68ce 100644 from synapse.events.utils import ( EventClientSerializer, SerializeEventConfig, -@@ -52,6 +55,7 @@ from synapse.events.utils import ( +@@ -58,6 +61,7 @@ from synapse.events.utils import ( serialize_event, ) from synapse.handlers.pagination import GetMessagesResult @@ -62,7 +62,7 @@ index d28be2befb..7bcfdb68ce 100644 from synapse.http.server import HttpServer from synapse.http.servlet import ( ResolveRoomIdMixin, -@@ -486,7 +490,6 @@ class RoomSendEventRestServlet(TransactionRestServlet): +@@ -513,7 +517,6 @@ class RoomSendEventRestServlet(TransactionRestServlet): txn_id, ) @@ -70,7 +70,7 @@ index d28be2befb..7bcfdb68ce 100644 def _parse_request_delay( request: SynapseRequest, max_delay: int | None, -@@ -1728,6 +1731,112 @@ class RoomSummaryRestServlet(ResolveRoomIdMixin, RestServlet): +@@ -1755,6 +1758,112 @@ class RoomSummaryRestServlet(ResolveRoomIdMixin, RestServlet): remote_room_hosts, ) @@ -183,7 +183,7 @@ index d28be2befb..7bcfdb68ce 100644 def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: RoomStateEventRestServlet(hs).register(http_server) -@@ -1737,6 +1846,7 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: +@@ -1764,6 +1873,7 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: JoinRoomAliasServlet(hs).register(http_server) RoomMembershipRestServlet(hs).register(http_server) RoomSendEventRestServlet(hs).register(http_server) @@ -192,5 +192,5 @@ index d28be2befb..7bcfdb68ce 100644 RoomStateRestServlet(hs).register(http_server) RoomRedactEventRestServlet(hs).register(http_server) -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch b/packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch
index 63a5ba0..08f1357 100644 --- a/packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch +++ b/packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch
@@ -1,4 +1,4 @@ -From 1082cc5441ca3153016c456b89b07ce7846525e2 Mon Sep 17 00:00:00 2001 +From 3196bce10b7842aa435036105d525e0f10153ad9 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Mon, 27 Oct 2025 19:23:42 +0100 Subject: [PATCH 18/25] admin api - send more data @@ -43,7 +43,7 @@ index e97d076a44..09a8a01f77 100644 response = { diff --git a/synapse/rest/client/capabilities.py b/synapse/rest/client/capabilities.py -index 5a85a415e6..3326ead0d5 100644 +index 075c3de261..c0b0a9923f 100644 --- a/synapse/rest/client/capabilities.py +++ b/synapse/rest/client/capabilities.py @@ -76,6 +76,9 @@ class CapabilitiesRestServlet(RestServlet): @@ -166,5 +166,5 @@ index 7623208c28..08735e1fbb 100644 return result -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch b/packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch
index 3b7019a..ae0fe60 100644 --- a/packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch +++ b/packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch
@@ -1,4 +1,4 @@ -From 885576e816a6f888a7e294a717362f630c75cc6a Mon Sep 17 00:00:00 2001 +From 4c2eb25d811fd5deeb2c92318460fcd7bdf7dfe1 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 28 Oct 2025 00:01:45 +0100 Subject: [PATCH 19/25] Allow overriding max background task count @@ -31,7 +31,7 @@ index 13c9c4dba0..a8add434d2 100644 # to the old method. if "rc_message" in config: diff --git a/synapse/util/task_scheduler.py b/synapse/util/task_scheduler.py -index e5cfc85a37..2aaf7a017f 100644 +index c1790fd3ae..a083e5b694 100644 --- a/synapse/util/task_scheduler.py +++ b/synapse/util/task_scheduler.py @@ -142,6 +142,12 @@ class TaskScheduler: @@ -48,5 +48,5 @@ index e5cfc85a37..2aaf7a017f 100644 self, function: Callable[ -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0020-max-and-min-were-probably-switched.-Set-max-to-arbit.patch b/packages/overlays/matrix-synapse/patches/0020-max-and-min-were-probably-switched.-Set-max-to-arbit.patch
index 3fa292e..2eb65d0 100644 --- a/packages/overlays/matrix-synapse/patches/0020-max-and-min-were-probably-switched.-Set-max-to-arbit.patch +++ b/packages/overlays/matrix-synapse/patches/0020-max-and-min-were-probably-switched.-Set-max-to-arbit.patch
@@ -1,4 +1,4 @@ -From bf1ab7b6b7bdfda9329ca1952b244162edf90aa9 Mon Sep 17 00:00:00 2001 +From 1234193eed9a92a21847d69b59e1673fdf43e0d6 Mon Sep 17 00:00:00 2001 From: Jason Little <j.little@famedly.com> Date: Fri, 2 Jan 2026 12:48:22 -0600 Subject: [PATCH 20/25] max() and min() were probably switched. Set max to @@ -35,5 +35,5 @@ index 1537a18cc0..82dd896d5a 100644 "Lock timeout is getting excessive: %ss. There may be a deadlock.", self._retry_interval, -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0021-changelog.patch b/packages/overlays/matrix-synapse/patches/0021-changelog.patch
index 40cf414..080adb5 100644 --- a/packages/overlays/matrix-synapse/patches/0021-changelog.patch +++ b/packages/overlays/matrix-synapse/patches/0021-changelog.patch
@@ -1,4 +1,4 @@ -From 5608626043f1a410b1ec426f58e77a7259f68186 Mon Sep 17 00:00:00 2001 +From 2f79297e093ae244cb04384dd5f82b22f1ab4368 Mon Sep 17 00:00:00 2001 From: Jason Little <j.little@famedly.com> Date: Tue, 20 Jan 2026 06:42:18 -0600 Subject: [PATCH 21/25] changelog @@ -16,5 +16,5 @@ index 0000000000..eb93fffe15 @@ -0,0 +1 @@ +Prevent excessively long numbers for the retry interval of `WorkerLock`s. Contributed by Famedly. -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch b/packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch
index db9f06b..f44d4a6 100644 --- a/packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch +++ b/packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch
@@ -1,4 +1,4 @@ -From b4eaaae1102b713bae9799b5655e07eb43966550 Mon Sep 17 00:00:00 2001 +From a72a358805f6c9be5b4b2145feb68f5ac04d7d76 Mon Sep 17 00:00:00 2001 From: Jason Little <j.little@famedly.com> Date: Wed, 21 Jan 2026 06:57:34 -0600 Subject: [PATCH 22/25] Update changelog.d/19394.bugfix @@ -16,5 +16,5 @@ index eb93fffe15..3591c0a745 100644 -Prevent excessively long numbers for the retry interval of `WorkerLock`s. Contributed by Famedly. +Capped the `WorkerLock` retry interval to a maximum of 15 minutes to prevent dealing with excessively long numbers. Contributed by Famedly. -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0023-Adjust-for-the-retry-interval-actually-being-a-timeo.patch b/packages/overlays/matrix-synapse/patches/0023-Adjust-for-the-retry-interval-actually-being-a-timeo.patch
index f965483..a0b4f12 100644 --- a/packages/overlays/matrix-synapse/patches/0023-Adjust-for-the-retry-interval-actually-being-a-timeo.patch +++ b/packages/overlays/matrix-synapse/patches/0023-Adjust-for-the-retry-interval-actually-being-a-timeo.patch
@@ -1,4 +1,4 @@ -From 13ccc96c9a41e4a80375e9be0b288d6ef9711630 Mon Sep 17 00:00:00 2001 +From 1b4f575be3f4607e49422bf5aa25d6c43e19476f Mon Sep 17 00:00:00 2001 From: Jason Little <j.little@famedly.com> Date: Mon, 26 Jan 2026 10:26:38 -0600 Subject: [PATCH 23/25] Adjust for the retry interval actually being a timeout @@ -253,5 +253,5 @@ index 61ff51ff92..3ae44d48e2 100644 + self.get_success(d2) + self.get_success(lock2.__aexit__(None, None, None)) -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0024-unecessarily-long-pump-in-test-left-over-from-testin.patch b/packages/overlays/matrix-synapse/patches/0024-unecessarily-long-pump-in-test-left-over-from-testin.patch
index 3a75bc6..119c299 100644 --- a/packages/overlays/matrix-synapse/patches/0024-unecessarily-long-pump-in-test-left-over-from-testin.patch +++ b/packages/overlays/matrix-synapse/patches/0024-unecessarily-long-pump-in-test-left-over-from-testin.patch
@@ -1,4 +1,4 @@ -From 6a18e62bcf4d1bd21b4105495c10f5deaf8f902a Mon Sep 17 00:00:00 2001 +From 1a891a977868a708d2c805ef2e8ff2dfa2438106 Mon Sep 17 00:00:00 2001 From: Jason Little <j.little@famedly.com> Date: Mon, 26 Jan 2026 11:18:29 -0600 Subject: [PATCH 24/25] unecessarily long pump() in test, left over from @@ -22,5 +22,5 @@ index 3ae44d48e2..c5c3ce22ef 100644 # Should be timed out 6 times, but do not fail on that exact count wrapped_lock2_increment_timeout_interval_method.assert_called() -- -2.52.0 +2.53.0 diff --git a/packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch b/packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch
index fabaeff..b3667b0 100644 --- a/packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch +++ b/packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch
@@ -1,4 +1,4 @@ -From facc7fb4494360dcd96099fcbdb223c5933e6321 Mon Sep 17 00:00:00 2001 +From 41d6399023ab3ae231de04addb9369f4a295b63d Mon Sep 17 00:00:00 2001 From: Jason Little <j.little@famedly.com> Date: Mon, 26 Jan 2026 11:18:38 -0600 Subject: [PATCH 25/25] adjust changelog(again) @@ -15,5 +15,5 @@ index 3591c0a745..02131d89ba 100644 -Capped the `WorkerLock` retry interval to a maximum of 15 minutes to prevent dealing with excessively long numbers. Contributed by Famedly. +Capped the `WorkerLock` time out interval to a maximum of 15 minutes to prevent dealing with excessively long numbers and prevent logging when the retry is not an actual time out. Contributed by Famedly. -- -2.52.0 +2.53.0