summary refs log tree commit diff
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2026-04-28 04:37:01 +0200
committerRory& <root@rory.gay>2026-04-28 04:37:01 +0200
commitbc140e1e7d8301a6fbb8134713f8a3413991948c (patch)
treeea52bfbb85611da1ddfd0c3ef79c88a2cc17f371
parentRevert failed experiment (diff)
downloadRory-Open-Architecture-bc140e1e7d8301a6fbb8134713f8a3413991948c.tar.xz
Update synapse patches for 1.151
-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.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0009-Log-entire-room-if-accessibility-check-fails.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch31
-rw-r--r--packages/overlays/matrix-synapse/patches/0010-Use-parse_boolean-for-unredacted-content.patch (renamed from packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch)6
-rw-r--r--packages/overlays/matrix-synapse/patches/0011-Expose-tombstone-in-room-admin-api.patch (renamed from packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch)8
-rw-r--r--packages/overlays/matrix-synapse/patches/0012-fix-Always-recheck-messages-pagination-data-if-a-bac.patch (renamed from packages/overlays/matrix-synapse/patches/0013-fix-Always-recheck-messages-pagination-data-if-a-bac.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0013-Fix-pagination-with-large-gaps-of-rejected-events.patch (renamed from packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0014-RequestRatelimiter-expose-can_do_action.patch (renamed from packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0015-Clarify-pre_event_ids-assert-in-event-creation-handl.patch (renamed from packages/overlays/matrix-synapse/patches/0016-Clarify-pre_event_ids-assert-in-event-creation-handl.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0016-Add-bulk-send-events-endpoint.patch (renamed from packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch)11
-rw-r--r--packages/overlays/matrix-synapse/patches/0017-admin-api-send-more-data.patch (renamed from packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch)6
-rw-r--r--packages/overlays/matrix-synapse/patches/0018-Allow-overriding-max-background-task-count.patch (renamed from packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0019-max-and-min-were-probably-switched.-Set-max-to-arbit.patch (renamed from packages/overlays/matrix-synapse/patches/0020-max-and-min-were-probably-switched.-Set-max-to-arbit.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0020-changelog.patch (renamed from packages/overlays/matrix-synapse/patches/0021-changelog.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0021-Update-changelog.d-19394.bugfix.patch (renamed from packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0022-Adjust-for-the-retry-interval-actually-being-a-timeo.patch (renamed from packages/overlays/matrix-synapse/patches/0023-Adjust-for-the-retry-interval-actually-being-a-timeo.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0023-unecessarily-long-pump-in-test-left-over-from-testin.patch (renamed from packages/overlays/matrix-synapse/patches/0024-unecessarily-long-pump-in-test-left-over-from-testin.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0024-adjust-changelog-again.patch (renamed from packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch)4
25 files changed, 59 insertions, 91 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 64e554b..accdedf 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,7 +1,7 @@ -From 1bcec5a1e035e7294d16f4de7cccd25de09fb40a Mon Sep 17 00:00:00 2001 +From 9279a3afa3792427a87caf864e68e631aec3b407 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 +Subject: [PATCH 01/24] nix: use postgres 17 Signed-off-by: Rory& <root@rory.gay> --- 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 b0258c3..89f7a7c 100644 --- a/packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch +++ b/packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch
@@ -1,7 +1,7 @@ -From caa9828ad8335c75eb0f1699e983dd44efa66b5b Mon Sep 17 00:00:00 2001 +From 3815d07cfc961a33970ff6a633b2a784347679e6 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 +Subject: [PATCH 02/24] nix: fix flake Signed-off-by: Rory& <root@rory.gay> --- 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 342f16d..8c6d965 100644 --- a/packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch +++ b/packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch
@@ -1,7 +1,7 @@ -From a858063c19500691e638d368a3f49e02889b315f Mon Sep 17 00:00:00 2001 +From 2af8ac106c6293bc4773f6ce6bc4726de34717ef 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 +Subject: [PATCH 03/24] nix: Update flake Signed-off-by: Rory& <root@rory.gay> --- 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 c814dbf..d07e7b6 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,7 +1,7 @@ -From a4aeac60b232762c683ff6d2bfcbe56ae2bc35ee Mon Sep 17 00:00:00 2001 +From e22d8e8148e718517a97a3862c1703e9cd8d3798 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 +Subject: [PATCH 04/24] nix: Temporarily disable go in flake Signed-off-by: Rory& <root@rory.gay> --- 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 ca7d47e..298b5ae 100644 --- a/packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch +++ b/packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch
@@ -1,7 +1,7 @@ -From 5174d4530faf93639c657e58a6a27935986da7b4 Mon Sep 17 00:00:00 2001 +From 09271771eee0188524ec1a553e8788c828846f5b 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 +Subject: [PATCH 05/24] Add test script Signed-off-by: Rory& <root@rory.gay> --- 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 f48c410..4de298e 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,7 +1,7 @@ -From 18b97cfb2401d3c5325250dbf6c339ef873cd515 Mon Sep 17 00:00:00 2001 +From 18dc29d6776d5d888db1b78fa936545fb98c67d1 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 +Subject: [PATCH 06/24] Fix gitignore to ignore .venv Signed-off-by: Rory& <root@rory.gay> --- 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 57d382f..db96ea1 100644 --- a/packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch +++ b/packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch
@@ -1,7 +1,7 @@ -From 4f0166fdae36a7bde86576ce4cac25b9d5ba7a98 Mon Sep 17 00:00:00 2001 +From 669cab3576182215852c9c2a06739106f1aecc14 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 +Subject: [PATCH 07/24] Fast auth links Signed-off-by: Rory& <root@rory.gay> --- 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 d05f91e..f81e616 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,7 +1,7 @@ -From b52d3a34f03fc5307f44faf3ec85dd73a785bd4e Mon Sep 17 00:00:00 2001 +From 5b827992d4c68a0ff31e544cf28f78541b16bf74 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 +Subject: [PATCH 08/24] Add too much logging to room summary over federation Signed-off-by: Rory& <root@rory.gay> --- @@ -9,10 +9,10 @@ Signed-off-by: Rory& <root@rory.gay> 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/synapse/handlers/room_summary.py b/synapse/handlers/room_summary.py -index 9ec0d33f11..5ea32af620 100644 +index bbcdc0877e..5a35d4d0e1 100644 --- a/synapse/handlers/room_summary.py +++ b/synapse/handlers/room_summary.py -@@ -748,23 +748,55 @@ class RoomSummaryHandler: +@@ -747,23 +747,55 @@ class RoomSummaryHandler: """ # The API doesn't return the room version so assume that a # join rule of knock is valid. 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 3250311..71ab64b 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,7 +1,7 @@ -From 2b3a5ce99695c14ac92c74f17c3ee47ae7d1f93f Mon Sep 17 00:00:00 2001 +From dfc816f4f3a2a457013013d4415a99d60d971289 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 +Subject: [PATCH 09/24] Log entire room if accessibility check fails Signed-off-by: Rory& <root@rory.gay> --- @@ -9,10 +9,10 @@ Signed-off-by: Rory& <root@rory.gay> 1 file changed, 4 insertions(+) diff --git a/synapse/handlers/room_summary.py b/synapse/handlers/room_summary.py -index 5ea32af620..30ee91cd95 100644 +index 5a35d4d0e1..9f904af2ea 100644 --- a/synapse/handlers/room_summary.py +++ b/synapse/handlers/room_summary.py -@@ -964,6 +964,10 @@ class RoomSummaryHandler: +@@ -961,6 +961,10 @@ class RoomSummaryHandler: if not room_entry or not await self._is_remote_room_accessible( requester, room_entry.room_id, room_entry.room ): 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 deleted file mode 100644
index b75501f..0000000 --- a/packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch +++ /dev/null
@@ -1,31 +0,0 @@ -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 - -Signed-off-by: Rory& <root@rory.gay> ---- - synapse/handlers/room_policy.py | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/synapse/handlers/room_policy.py b/synapse/handlers/room_policy.py -index 0663a36714..d2216978ac 100644 ---- a/synapse/handlers/room_policy.py -+++ b/synapse/handlers/room_policy.py -@@ -111,6 +111,13 @@ class RoomPolicyHandler: - policy_server, event - ) - if recommendation != RECOMMENDATION_OK: -+ logger.info( -+ "[POLICY] Policy server %s recommended not to allow event %s in room %s: %s", -+ policy_server, -+ event.event_id, -+ event.room_id, -+ recommendation, -+ ) - return False - - return True # default allow --- -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/0010-Use-parse_boolean-for-unredacted-content.patch
index 80ddb8f..fe73296 100644 --- a/packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch +++ b/packages/overlays/matrix-synapse/patches/0010-Use-parse_boolean-for-unredacted-content.patch
@@ -1,7 +1,7 @@ -From e7ef63ba7d64a1aedb7455ed0e9492397e97b00b Mon Sep 17 00:00:00 2001 +From f2d18127aff7ad78db1f868e53fe804d70bbe981 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 +Subject: [PATCH 10/24] Use parse_boolean for unredacted content Signed-off-by: Rory& <root@rory.gay> --- @@ -9,7 +9,7 @@ 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 9172bfcb4e..07df0bbbee 100644 +index 65d9c130ef..a395f1d693 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -1050,10 +1050,9 @@ class RoomEventServlet(RestServlet): diff --git a/packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch b/packages/overlays/matrix-synapse/patches/0011-Expose-tombstone-in-room-admin-api.patch
index 0efe0b4..074c615 100644 --- a/packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch +++ b/packages/overlays/matrix-synapse/patches/0011-Expose-tombstone-in-room-admin-api.patch
@@ -1,7 +1,7 @@ -From e3287a79f2164c1966cfbc91138f6f2c8515af0c Mon Sep 17 00:00:00 2001 +From 216293bb5649fab432fbec34af80e68ff2217276 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 +Subject: [PATCH 11/24] Expose tombstone in room admin api Signed-off-by: Rory& <root@rory.gay> --- @@ -34,7 +34,7 @@ index a886859ffa..e97d076a44 100644 response = { diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py -index 07df0bbbee..875890470e 100644 +index a395f1d693..6631e629db 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -1054,7 +1054,6 @@ class RoomEventServlet(RestServlet): @@ -46,7 +46,7 @@ index 07df0bbbee..875890470e 100644 if include_unredacted_content and not await self.auth.is_server_admin( requester diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py -index 633df07736..7623208c28 100644 +index 7ac88e4c2a..ff647c0c5b 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -605,6 +605,7 @@ class RoomWorkerStore(CacheInvalidationWorkerStore): 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/0012-fix-Always-recheck-messages-pagination-data-if-a-bac.patch
index 88657d7..e666cfe 100644 --- a/packages/overlays/matrix-synapse/patches/0013-fix-Always-recheck-messages-pagination-data-if-a-bac.patch +++ b/packages/overlays/matrix-synapse/patches/0012-fix-Always-recheck-messages-pagination-data-if-a-bac.patch
@@ -1,7 +1,7 @@ -From efb007f59d2b9426b806ad2ed891410a290626e2 Mon Sep 17 00:00:00 2001 +From 6c31b7de9e5d860a223e0a73749276048fd9f617 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 +Subject: [PATCH 12/24] fix: Always recheck `/messages` pagination data if a backfill might have been needed (#28) Signed-off-by: Rory& <root@rory.gay> diff --git a/packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch b/packages/overlays/matrix-synapse/patches/0013-Fix-pagination-with-large-gaps-of-rejected-events.patch
index 25cabea..b82b2ba 100644 --- a/packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch +++ b/packages/overlays/matrix-synapse/patches/0013-Fix-pagination-with-large-gaps-of-rejected-events.patch
@@ -1,7 +1,7 @@ -From 2a6a3836c68cdf3aa1841168cb847c552a14110e Mon Sep 17 00:00:00 2001 +From c960746dd2eb364ed647e2ac1ce67db938e8d6f5 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 +Subject: [PATCH 13/24] Fix pagination with large gaps of rejected events Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch b/packages/overlays/matrix-synapse/patches/0014-RequestRatelimiter-expose-can_do_action.patch
index 6b43100..266135b 100644 --- a/packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch +++ b/packages/overlays/matrix-synapse/patches/0014-RequestRatelimiter-expose-can_do_action.patch
@@ -1,7 +1,7 @@ -From 5433142126b82a063aa520245386830cbbe78357 Mon Sep 17 00:00:00 2001 +From 79ebebba08a1ff26d93606daf808f7c07cbf19b2 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 +Subject: [PATCH 14/24] RequestRatelimiter: expose can_do_action Signed-off-by: Rory& <root@rory.gay> --- 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/0015-Clarify-pre_event_ids-assert-in-event-creation-handl.patch
index 3c947d6..f476f33 100644 --- a/packages/overlays/matrix-synapse/patches/0016-Clarify-pre_event_ids-assert-in-event-creation-handl.patch +++ b/packages/overlays/matrix-synapse/patches/0015-Clarify-pre_event_ids-assert-in-event-creation-handl.patch
@@ -1,7 +1,7 @@ -From cebfa78c89bd9a89b652fce64dc99fe26df1b6b1 Mon Sep 17 00:00:00 2001 +From 5281f1a0db81a620113452176a1ef8194d1e8e4a 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 +Subject: [PATCH 15/24] Clarify pre_event_ids assert in event creation handler Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch b/packages/overlays/matrix-synapse/patches/0016-Add-bulk-send-events-endpoint.patch
index 7941117..a589d9d 100644 --- a/packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch +++ b/packages/overlays/matrix-synapse/patches/0016-Add-bulk-send-events-endpoint.patch
@@ -1,7 +1,7 @@ -From ac2d85fc125811f2d6d9f302ed30e2f96fc4491e Mon Sep 17 00:00:00 2001 +From 20006e0e445baf4d1364ed439cc15050895755cd 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 +Subject: [PATCH 16/24] Add bulk send events endpoint Try to optimise bulk sending some more @@ -30,7 +30,7 @@ index 705d74dee1..075c3de261 100644 } diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py -index 875890470e..67820f706e 100644 +index 6631e629db..f21240e346 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -23,10 +23,12 @@ @@ -46,7 +46,7 @@ index 875890470e..67820f706e 100644 import attr from prometheus_client.core import Histogram -@@ -51,6 +53,7 @@ from synapse.api.errors import ( +@@ -51,12 +53,14 @@ from synapse.api.errors import ( UnredactedContentDeletedError, ) from synapse.api.filtering import Filter @@ -54,8 +54,7 @@ index 875890470e..67820f706e 100644 from synapse.events.utils import ( EventClientSerializer, SerializeEventConfig, -@@ -58,6 +61,7 @@ from synapse.events.utils import ( - serialize_event, + format_event_for_client_v2, ) from synapse.handlers.pagination import GetMessagesResult +from synapse.events import EventBase diff --git a/packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch b/packages/overlays/matrix-synapse/patches/0017-admin-api-send-more-data.patch
index 08f1357..4f56fff 100644 --- a/packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch +++ b/packages/overlays/matrix-synapse/patches/0017-admin-api-send-more-data.patch
@@ -1,7 +1,7 @@ -From 3196bce10b7842aa435036105d525e0f10153ad9 Mon Sep 17 00:00:00 2001 +From e72191197df3a6570dcf01ec4388eff15157ab58 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 +Subject: [PATCH 17/24] admin api - send more data Signed-off-by: Rory& <root@rory.gay> --- @@ -57,7 +57,7 @@ index 075c3de261..c0b0a9923f 100644 } } diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py -index 7623208c28..08735e1fbb 100644 +index ff647c0c5b..823540f4a0 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -606,6 +606,8 @@ class RoomWorkerStore(CacheInvalidationWorkerStore): diff --git a/packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch b/packages/overlays/matrix-synapse/patches/0018-Allow-overriding-max-background-task-count.patch
index ae0fe60..0c70f7b 100644 --- a/packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch +++ b/packages/overlays/matrix-synapse/patches/0018-Allow-overriding-max-background-task-count.patch
@@ -1,7 +1,7 @@ -From 4c2eb25d811fd5deeb2c92318460fcd7bdf7dfe1 Mon Sep 17 00:00:00 2001 +From d06812d14a01684c9dfaddc56756118a14e0cdb6 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 +Subject: [PATCH 18/24] Allow overriding max background task count Signed-off-by: Rory& <root@rory.gay> --- 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/0019-max-and-min-were-probably-switched.-Set-max-to-arbit.patch
index 2eb65d0..7052a97 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/0019-max-and-min-were-probably-switched.-Set-max-to-arbit.patch
@@ -1,7 +1,7 @@ -From 1234193eed9a92a21847d69b59e1673fdf43e0d6 Mon Sep 17 00:00:00 2001 +From 9278458858ba5237de2def33e479257da847ef8b 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 +Subject: [PATCH 19/24] max() and min() were probably switched. Set max to arbitrary 15 minutes, continue logging at durations greater than 10 minutes --- diff --git a/packages/overlays/matrix-synapse/patches/0021-changelog.patch b/packages/overlays/matrix-synapse/patches/0020-changelog.patch
index 080adb5..28df036 100644 --- a/packages/overlays/matrix-synapse/patches/0021-changelog.patch +++ b/packages/overlays/matrix-synapse/patches/0020-changelog.patch
@@ -1,7 +1,7 @@ -From 2f79297e093ae244cb04384dd5f82b22f1ab4368 Mon Sep 17 00:00:00 2001 +From f519fa835fa3da23ed312d7c64e548635dce28a5 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 +Subject: [PATCH 20/24] changelog --- changelog.d/19394.bugfix | 1 + diff --git a/packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch b/packages/overlays/matrix-synapse/patches/0021-Update-changelog.d-19394.bugfix.patch
index f44d4a6..b6a0441 100644 --- a/packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch +++ b/packages/overlays/matrix-synapse/patches/0021-Update-changelog.d-19394.bugfix.patch
@@ -1,7 +1,7 @@ -From a72a358805f6c9be5b4b2145feb68f5ac04d7d76 Mon Sep 17 00:00:00 2001 +From 351c195c6e78f93f22d01c368163e9db94e7496d 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 +Subject: [PATCH 21/24] Update changelog.d/19394.bugfix Co-authored-by: Eric Eastwood <madlittlemods@gmail.com> --- 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/0022-Adjust-for-the-retry-interval-actually-being-a-timeo.patch
index a0b4f12..bcfbdf4 100644 --- a/packages/overlays/matrix-synapse/patches/0023-Adjust-for-the-retry-interval-actually-being-a-timeo.patch +++ b/packages/overlays/matrix-synapse/patches/0022-Adjust-for-the-retry-interval-actually-being-a-timeo.patch
@@ -1,7 +1,7 @@ -From 1b4f575be3f4607e49422bf5aa25d6c43e19476f Mon Sep 17 00:00:00 2001 +From d4b741a582dde5ab68bbda75e02f617758055a52 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 +Subject: [PATCH 22/24] Adjust for the retry interval actually being a timeout interval, and only increase it when a timeout occurs --- 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/0023-unecessarily-long-pump-in-test-left-over-from-testin.patch
index 119c299..5b11819 100644 --- a/packages/overlays/matrix-synapse/patches/0024-unecessarily-long-pump-in-test-left-over-from-testin.patch +++ b/packages/overlays/matrix-synapse/patches/0023-unecessarily-long-pump-in-test-left-over-from-testin.patch
@@ -1,7 +1,7 @@ -From 1a891a977868a708d2c805ef2e8ff2dfa2438106 Mon Sep 17 00:00:00 2001 +From 60191c1dce61b42fc9eaeffad77ba573de072d0f 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 +Subject: [PATCH 23/24] unecessarily long pump() in test, left over from testing logging --- diff --git a/packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch b/packages/overlays/matrix-synapse/patches/0024-adjust-changelog-again.patch
index b3667b0..2926890 100644 --- a/packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch +++ b/packages/overlays/matrix-synapse/patches/0024-adjust-changelog-again.patch
@@ -1,7 +1,7 @@ -From 41d6399023ab3ae231de04addb9369f4a295b63d Mon Sep 17 00:00:00 2001 +From 887fd0bf50e451d63c1675de40712bf32c8baa7c 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) +Subject: [PATCH 24/24] adjust changelog(again) --- changelog.d/19394.bugfix | 2 +-