summary refs log tree commit diff
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2026-02-21 22:30:17 +0100
committerRory& <root@rory.gay>2026-02-21 22:30:24 +0100
commitfdbada601862d7d91ac2a523ee7b6a8bf03447da (patch)
tree26355d7a4848cd6a6387533c680f292ebe981eed
parentServer changes (diff)
downloadRory-Open-Architecture-fdbada601862d7d91ac2a523ee7b6a8bf03447da.tar.xz
prosody?
-rwxr-xr-xhost/Rory-ovh/services/nginx/rory.gay/root.nix26
-rw-r--r--host/Rory-ovh/services/prosody.nix13
-rw-r--r--packages/overlays/matrix-synapse/patches/0001-nix-use-postgres-17.patch (renamed from packages/overlays/matrix-synapse/patches/0007-nix-use-postgres-17.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch (renamed from packages/overlays/matrix-synapse/patches/0008-nix-fix-flake.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch (renamed from packages/overlays/matrix-synapse/patches/0009-nix-Update-flake.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0004-nix-Temporarily-disable-go-in-flake.patch (renamed from packages/overlays/matrix-synapse/patches/0010-nix-Temporarily-disable-go-in-flake.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch (renamed from packages/overlays/matrix-synapse/patches/0011-Add-test-script.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0006-Fix-gitignore-to-ignore-.venv.patch (renamed from packages/overlays/matrix-synapse/patches/0012-Fix-gitignore-to-ignore-.venv.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch (renamed from packages/overlays/matrix-synapse/patches/0013-Fast-auth-links.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0008-Add-too-much-logging-to-room-summary-over-federation.patch (renamed from packages/overlays/matrix-synapse/patches/0014-Add-too-much-logging-to-room-summary-over-federation.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0009-Log-entire-room-if-accessibility-check-fails.patch (renamed from packages/overlays/matrix-synapse/patches/0015-Log-entire-room-if-accessibility-check-fails.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch (renamed from packages/overlays/matrix-synapse/patches/0016-Log-policy-server-rejected-events.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch (renamed from packages/overlays/matrix-synapse/patches/0017-Use-parse_boolean-for-unredacted-content.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch (renamed from packages/overlays/matrix-synapse/patches/0018-Expose-tombstone-in-room-admin-api.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0013-fix-Always-recheck-messages-pagination-data-if-a-bac.patch (renamed from packages/overlays/matrix-synapse/patches/0019-fix-Always-recheck-messages-pagination-data-if-a-bac.patch)6
-rw-r--r--packages/overlays/matrix-synapse/patches/0014-Fix-pagination-with-large-gaps-of-rejected-events.patch (renamed from packages/overlays/matrix-synapse/patches/0020-Fix-pagination-with-large-gaps-of-rejected-events.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch (renamed from packages/overlays/matrix-synapse/patches/0021-RequestRatelimiter-expose-can_do_action.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0016-Clarify-pre_event_ids-assert-in-event-creation-handl.patch (renamed from packages/overlays/matrix-synapse/patches/0022-Clarify-pre_event_ids-assert-in-event-creation-handl.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch (renamed from packages/overlays/matrix-synapse/patches/0023-Add-bulk-send-events-endpoint.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch (renamed from packages/overlays/matrix-synapse/patches/0024-admin-api-send-more-data.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch (renamed from packages/overlays/matrix-synapse/patches/0025-Allow-overriding-max-background-task-count.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0020-max-and-min-were-probably-switched.-Set-max-to-arbit.patch (renamed from packages/overlays/matrix-synapse/patches/0001-max-and-min-were-probably-switched.-Set-max-to-arbit.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0021-changelog.patch (renamed from packages/overlays/matrix-synapse/patches/0002-changelog.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch (renamed from packages/overlays/matrix-synapse/patches/0003-Update-changelog.d-19394.bugfix.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0023-Adjust-for-the-retry-interval-actually-being-a-timeo.patch (renamed from packages/overlays/matrix-synapse/patches/0004-Adjust-for-the-retry-interval-actually-being-a-timeo.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0024-unecessarily-long-pump-in-test-left-over-from-testin.patch (renamed from packages/overlays/matrix-synapse/patches/0005-unecessarily-long-pump-in-test-left-over-from-testin.patch)4
-rw-r--r--packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch (renamed from packages/overlays/matrix-synapse/patches/0006-adjust-changelog-again.patch)4
27 files changed, 89 insertions, 52 deletions
diff --git a/host/Rory-ovh/services/nginx/rory.gay/root.nix b/host/Rory-ovh/services/nginx/rory.gay/root.nix

index 2f491cf..895ae77 100755 --- a/host/Rory-ovh/services/nginx/rory.gay/root.nix +++ b/host/Rory-ovh/services/nginx/rory.gay/root.nix
@@ -3,7 +3,7 @@ enableACME = !config.virtualisation.isVmVariant; addSSL = !config.virtualisation.isVmVariant; root = "/data/nginx/html_rory_gay"; - extraConfig = ''autoindex on;''; + extraConfig = "autoindex on;"; locations."= /.well-known/matrix/server".extraConfig = '' more_set_headers 'Content-Type application/json'; @@ -46,4 +46,28 @@ } }'; ''; + + locations."= /.well-known/host-meta".extraConfig = '' + more_set_headers 'Content-Type application/json'; + more_set_headers 'Access-Control-Allow-Origin *'; + return 200 '<?xml version='1.0' encoding='utf-8'?> + <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'> + <Link rel="urn:xmpp:alt-connections:websocket" + href="wss://xmpp.rory.gay/ws" /> + </XRD>'; + ''; + locations."= /.well-known/host-meta.json".extraConfig = '' + more_set_headers 'Content-Type application/json'; + more_set_headers 'Access-Control-Allow-Origin *'; + return 200 '${ + builtins.toJSON { + links = [ + { + rel = "urn:xmpp:alt-connections:websocket"; + href = "wss://xmpp.rory.gay/ws"; + } + ]; + } + }'; + ''; } diff --git a/host/Rory-ovh/services/prosody.nix b/host/Rory-ovh/services/prosody.nix new file mode 100644
index 0000000..53743a4 --- /dev/null +++ b/host/Rory-ovh/services/prosody.nix
@@ -0,0 +1,13 @@ +{ lib, pkgs, ... }: +{ + services.prosody = { + enable = true; + virtualhosts."rory.gay" = { + enabled = true; + domain = "rory.gay"; + }; + admins = [ + "emma@rory.gay" + ]; + }; +} diff --git a/packages/overlays/matrix-synapse/patches/0007-nix-use-postgres-17.patch b/packages/overlays/matrix-synapse/patches/0001-nix-use-postgres-17.patch
index 24afa44..7e079b6 100644 --- a/packages/overlays/matrix-synapse/patches/0007-nix-use-postgres-17.patch +++ b/packages/overlays/matrix-synapse/patches/0001-nix-use-postgres-17.patch
@@ -1,7 +1,7 @@ -From a347a2e48ca378902198c55b6e505d291f5c0440 Mon Sep 17 00:00:00 2001 +From 0710094b06b2b3eaad8212d24edd10066648cb17 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Fri, 25 Jul 2025 08:25:28 +0200 -Subject: [PATCH 07/25] nix: use postgres 17 +Subject: [PATCH 01/25] nix: use postgres 17 Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0008-nix-fix-flake.patch b/packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch
index adc77f9..014d2f5 100644 --- a/packages/overlays/matrix-synapse/patches/0008-nix-fix-flake.patch +++ b/packages/overlays/matrix-synapse/patches/0002-nix-fix-flake.patch
@@ -1,7 +1,7 @@ -From 52a291a179bde8f829d4939eef8d1ac29cbbe214 Mon Sep 17 00:00:00 2001 +From 3191ff6411778d266986ada3a68fd90427a9d283 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Mon, 9 Jun 2025 17:38:34 +0200 -Subject: [PATCH 08/25] nix: fix flake +Subject: [PATCH 02/25] nix: fix flake Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0009-nix-Update-flake.patch b/packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch
index 279c480..cd8148f 100644 --- a/packages/overlays/matrix-synapse/patches/0009-nix-Update-flake.patch +++ b/packages/overlays/matrix-synapse/patches/0003-nix-Update-flake.patch
@@ -1,7 +1,7 @@ -From b75e1462eea39068dd189755ffb0d9fb466c59cc Mon Sep 17 00:00:00 2001 +From 7bc7375545daed0571933e2a6063ecb0f78fecf7 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Thu, 13 Nov 2025 13:57:10 +0100 -Subject: [PATCH 09/25] nix: Update flake +Subject: [PATCH 03/25] nix: Update flake Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0010-nix-Temporarily-disable-go-in-flake.patch b/packages/overlays/matrix-synapse/patches/0004-nix-Temporarily-disable-go-in-flake.patch
index 69a748e..ed4e7f5 100644 --- a/packages/overlays/matrix-synapse/patches/0010-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 d4f3c5be4922dd80fd5f568909bb87a7f8b63585 Mon Sep 17 00:00:00 2001 +From ed37b0cde78794056afcae9030e38d97f010336d Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Sat, 16 Aug 2025 20:18:45 +0200 -Subject: [PATCH 10/25] nix: Temporarily disable go in flake +Subject: [PATCH 04/25] nix: Temporarily disable go in flake Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0011-Add-test-script.patch b/packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch
index 42578d6..60157ca 100644 --- a/packages/overlays/matrix-synapse/patches/0011-Add-test-script.patch +++ b/packages/overlays/matrix-synapse/patches/0005-Add-test-script.patch
@@ -1,7 +1,7 @@ -From a9691bcff0268ceaf0f104ebfae2ec87264eaabd Mon Sep 17 00:00:00 2001 +From d5295e735828d424d9217d7127ece66cad177986 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Thu, 13 Nov 2025 13:56:59 +0100 -Subject: [PATCH 11/25] Add test script +Subject: [PATCH 05/25] Add test script Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0012-Fix-gitignore-to-ignore-.venv.patch b/packages/overlays/matrix-synapse/patches/0006-Fix-gitignore-to-ignore-.venv.patch
index 8cb9746..1722347 100644 --- a/packages/overlays/matrix-synapse/patches/0012-Fix-gitignore-to-ignore-.venv.patch +++ b/packages/overlays/matrix-synapse/patches/0006-Fix-gitignore-to-ignore-.venv.patch
@@ -1,7 +1,7 @@ -From 1bd0f1088e49df63630d5a16e4607da4e6a7ab82 Mon Sep 17 00:00:00 2001 +From 93af91e5d4eb59c8f1a55d5d3f86746d9728d28a Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Mon, 9 Jun 2025 17:46:10 +0200 -Subject: [PATCH 12/25] Fix gitignore to ignore .venv +Subject: [PATCH 06/25] Fix gitignore to ignore .venv Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0013-Fast-auth-links.patch b/packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch
index 3d88dd6..1891da7 100644 --- a/packages/overlays/matrix-synapse/patches/0013-Fast-auth-links.patch +++ b/packages/overlays/matrix-synapse/patches/0007-Fast-auth-links.patch
@@ -1,7 +1,7 @@ -From 4d43d4b805789a8800ff8f0321ebe13432c0c7cf Mon Sep 17 00:00:00 2001 +From 7bf6dd9744da4eaccf201e62eef243b5e6c95314 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 22 Jul 2025 05:07:01 +0200 -Subject: [PATCH 13/25] Fast auth links +Subject: [PATCH 07/25] Fast auth links Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0014-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 c89ddbf..a4cf1fb 100644 --- a/packages/overlays/matrix-synapse/patches/0014-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 0a2dc85a4e9e1c492b7d399fedd1dcb32511383f Mon Sep 17 00:00:00 2001 +From 4d1ba2cb8982f0f72116753da80744947a09f373 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Wed, 23 Apr 2025 17:53:52 +0200 -Subject: [PATCH 14/25] Add too much logging to room summary over federation +Subject: [PATCH 08/25] Add too much logging to room summary over federation Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0015-Log-entire-room-if-accessibility-check-fails.patch b/packages/overlays/matrix-synapse/patches/0009-Log-entire-room-if-accessibility-check-fails.patch
index d471056..d189ca2 100644 --- a/packages/overlays/matrix-synapse/patches/0015-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 44797ee743422f0e5658b21c97c8e558838a1ca8 Mon Sep 17 00:00:00 2001 +From 521c06d64c7a22bea6db9a78337c53b70c44cbe3 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Wed, 23 Apr 2025 18:24:57 +0200 -Subject: [PATCH 15/25] Log entire room if accessibility check fails +Subject: [PATCH 09/25] Log entire room if accessibility check fails Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0016-Log-policy-server-rejected-events.patch b/packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch
index b8721ef..7bf9a02 100644 --- a/packages/overlays/matrix-synapse/patches/0016-Log-policy-server-rejected-events.patch +++ b/packages/overlays/matrix-synapse/patches/0010-Log-policy-server-rejected-events.patch
@@ -1,7 +1,7 @@ -From f1a71014702672957fc725e4868da89e98cd0ca9 Mon Sep 17 00:00:00 2001 +From 2fdf69e5d068f20dfaf31097d05f2ba72a8bd374 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 05:21:46 +0200 -Subject: [PATCH 16/25] Log policy server rejected events +Subject: [PATCH 10/25] Log policy server rejected events Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0017-Use-parse_boolean-for-unredacted-content.patch b/packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch
index 42b38d5..0bdfbdf 100644 --- a/packages/overlays/matrix-synapse/patches/0017-Use-parse_boolean-for-unredacted-content.patch +++ b/packages/overlays/matrix-synapse/patches/0011-Use-parse_boolean-for-unredacted-content.patch
@@ -1,7 +1,7 @@ -From df76199739b64d4f461cd73c97438417319188f1 Mon Sep 17 00:00:00 2001 +From ef028691294d2b6b15af1d2225dd2a777ec28cc4 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 06:14:26 +0200 -Subject: [PATCH 17/25] Use parse_boolean for unredacted content +Subject: [PATCH 11/25] Use parse_boolean for unredacted content Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0018-Expose-tombstone-in-room-admin-api.patch b/packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch
index 01af09a..514f817 100644 --- a/packages/overlays/matrix-synapse/patches/0018-Expose-tombstone-in-room-admin-api.patch +++ b/packages/overlays/matrix-synapse/patches/0012-Expose-tombstone-in-room-admin-api.patch
@@ -1,7 +1,7 @@ -From ffebf97a7aac3b174091eb02fbc180eda261b17f Mon Sep 17 00:00:00 2001 +From 94b2da38a5ab6200a7c7bc4a5e50a327f5aa128d Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 06:37:52 +0200 -Subject: [PATCH 18/25] Expose tombstone in room admin api +Subject: [PATCH 12/25] Expose tombstone in room admin api Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0019-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 3197084..535a353 100644 --- a/packages/overlays/matrix-synapse/patches/0019-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,7 +1,7 @@ -From 411dee16d58e9fa461b5a3883acf6fe68821cb36 Mon Sep 17 00:00:00 2001 +From 5cd230419f6dc712ad6f0b931f7009f7fe0f0148 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 19/25] fix: Always recheck `/messages` pagination data if a +Subject: [PATCH 13/25] fix: Always recheck `/messages` pagination data if a backfill might have been needed (#28) Signed-off-by: Rory& <root@rory.gay> @@ -11,7 +11,7 @@ Signed-off-by: Rory& <root@rory.gay> 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py -index 7808f8928b..7131a7ae3d 100644 +index 14805ac80f..04f8587fd8 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -191,7 +191,7 @@ class FederationHandler: diff --git a/packages/overlays/matrix-synapse/patches/0020-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 fae9e5a..89e812e 100644 --- a/packages/overlays/matrix-synapse/patches/0020-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,7 +1,7 @@ -From a17498c26ea8e729f2cdcda7e7c8ae1be46db011 Mon Sep 17 00:00:00 2001 +From 4775b12430b2fd8c7487f3779087cd16ece63bf7 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 20/25] Fix pagination with large gaps of rejected events +Subject: [PATCH 14/25] Fix pagination with large gaps of rejected events Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0021-RequestRatelimiter-expose-can_do_action.patch b/packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch
index 0639e19..635e1a6 100644 --- a/packages/overlays/matrix-synapse/patches/0021-RequestRatelimiter-expose-can_do_action.patch +++ b/packages/overlays/matrix-synapse/patches/0015-RequestRatelimiter-expose-can_do_action.patch
@@ -1,7 +1,7 @@ -From c0fdf986b551c9511e49111ecc5660ccc1bb0ae0 Mon Sep 17 00:00:00 2001 +From edb8616c493500b52f509a8c27ee2d62ebfae758 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Fri, 25 Jul 2025 08:26:15 +0200 -Subject: [PATCH 21/25] RequestRatelimiter: expose can_do_action +Subject: [PATCH 15/25] RequestRatelimiter: expose can_do_action Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0022-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 aef2fed..ec49b23 100644 --- a/packages/overlays/matrix-synapse/patches/0022-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,7 +1,7 @@ -From 568c93e969534eaf29997aa38efb4ac35f493617 Mon Sep 17 00:00:00 2001 +From dd61c685748369af6e7b46dd55ea4f5b8d4447b7 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Sat, 16 Aug 2025 20:19:08 +0200 -Subject: [PATCH 22/25] Clarify pre_event_ids assert in event creation handler +Subject: [PATCH 16/25] Clarify pre_event_ids assert in event creation handler Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0023-Add-bulk-send-events-endpoint.patch b/packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch
index 99c6b5e..04f7835 100644 --- a/packages/overlays/matrix-synapse/patches/0023-Add-bulk-send-events-endpoint.patch +++ b/packages/overlays/matrix-synapse/patches/0017-Add-bulk-send-events-endpoint.patch
@@ -1,7 +1,7 @@ -From f004f0bb0a88ced5db426b0eacbc3c80302d59a2 Mon Sep 17 00:00:00 2001 +From a96f2eb4361749a083b0c8a49068af8154333232 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Sat, 26 Jul 2025 09:50:56 +0200 -Subject: [PATCH 23/25] Add bulk send events endpoint +Subject: [PATCH 17/25] Add bulk send events endpoint Try to optimise bulk sending some more diff --git a/packages/overlays/matrix-synapse/patches/0024-admin-api-send-more-data.patch b/packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch
index 2689260..63a5ba0 100644 --- a/packages/overlays/matrix-synapse/patches/0024-admin-api-send-more-data.patch +++ b/packages/overlays/matrix-synapse/patches/0018-admin-api-send-more-data.patch
@@ -1,7 +1,7 @@ -From f859e4a53860ff3129042872968a826e42d4e6f0 Mon Sep 17 00:00:00 2001 +From 1082cc5441ca3153016c456b89b07ce7846525e2 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Mon, 27 Oct 2025 19:23:42 +0100 -Subject: [PATCH 24/25] admin api - send more data +Subject: [PATCH 18/25] admin api - send more data Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0025-Allow-overriding-max-background-task-count.patch b/packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch
index c5a0310..3b7019a 100644 --- a/packages/overlays/matrix-synapse/patches/0025-Allow-overriding-max-background-task-count.patch +++ b/packages/overlays/matrix-synapse/patches/0019-Allow-overriding-max-background-task-count.patch
@@ -1,7 +1,7 @@ -From e5d0a37b36c43c396356c72563f448df799bfc6c Mon Sep 17 00:00:00 2001 +From 885576e816a6f888a7e294a717362f630c75cc6a Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 28 Oct 2025 00:01:45 +0100 -Subject: [PATCH 25/25] Allow overriding max background task count +Subject: [PATCH 19/25] Allow overriding max background task count Signed-off-by: Rory& <root@rory.gay> --- diff --git a/packages/overlays/matrix-synapse/patches/0001-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 60df8a5..3fa292e 100644 --- a/packages/overlays/matrix-synapse/patches/0001-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,7 +1,7 @@ -From ff23d0011f30988a043d2f9817d96b9ba483c266 Mon Sep 17 00:00:00 2001 +From bf1ab7b6b7bdfda9329ca1952b244162edf90aa9 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 01/25] max() and min() were probably switched. Set max to +Subject: [PATCH 20/25] 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/0002-changelog.patch b/packages/overlays/matrix-synapse/patches/0021-changelog.patch
index 33e6e8d..40cf414 100644 --- a/packages/overlays/matrix-synapse/patches/0002-changelog.patch +++ b/packages/overlays/matrix-synapse/patches/0021-changelog.patch
@@ -1,7 +1,7 @@ -From 548c85b0fb604718ff52f987defba77ed3d21c10 Mon Sep 17 00:00:00 2001 +From 5608626043f1a410b1ec426f58e77a7259f68186 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 02/25] changelog +Subject: [PATCH 21/25] changelog --- changelog.d/19394.bugfix | 1 + diff --git a/packages/overlays/matrix-synapse/patches/0003-Update-changelog.d-19394.bugfix.patch b/packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch
index e66e80c..db9f06b 100644 --- a/packages/overlays/matrix-synapse/patches/0003-Update-changelog.d-19394.bugfix.patch +++ b/packages/overlays/matrix-synapse/patches/0022-Update-changelog.d-19394.bugfix.patch
@@ -1,7 +1,7 @@ -From 1d22f90bd3368caeb620d82f233fa1708eda4811 Mon Sep 17 00:00:00 2001 +From b4eaaae1102b713bae9799b5655e07eb43966550 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 03/25] Update changelog.d/19394.bugfix +Subject: [PATCH 22/25] Update changelog.d/19394.bugfix Co-authored-by: Eric Eastwood <madlittlemods@gmail.com> --- diff --git a/packages/overlays/matrix-synapse/patches/0004-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 eb11a01..f965483 100644 --- a/packages/overlays/matrix-synapse/patches/0004-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,7 +1,7 @@ -From e864cfe25f590dd75b31ad6e8ca0dccccf48df60 Mon Sep 17 00:00:00 2001 +From 13ccc96c9a41e4a80375e9be0b288d6ef9711630 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 04/25] Adjust for the retry interval actually being a timeout +Subject: [PATCH 23/25] 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/0005-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 f39a6b5..3a75bc6 100644 --- a/packages/overlays/matrix-synapse/patches/0005-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,7 +1,7 @@ -From d416dc8c41ab43df323ae4ba16341623c55fff6f Mon Sep 17 00:00:00 2001 +From 6a18e62bcf4d1bd21b4105495c10f5deaf8f902a 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 05/25] unecessarily long pump() in test, left over from +Subject: [PATCH 24/25] unecessarily long pump() in test, left over from testing logging --- diff --git a/packages/overlays/matrix-synapse/patches/0006-adjust-changelog-again.patch b/packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch
index c41f5f5..fabaeff 100644 --- a/packages/overlays/matrix-synapse/patches/0006-adjust-changelog-again.patch +++ b/packages/overlays/matrix-synapse/patches/0025-adjust-changelog-again.patch
@@ -1,7 +1,7 @@ -From e555cd68f25d6f81f4a6cdaf28ecda74a043ae3e Mon Sep 17 00:00:00 2001 +From facc7fb4494360dcd96099fcbdb223c5933e6321 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 06/25] adjust changelog(again) +Subject: [PATCH 25/25] adjust changelog(again) --- changelog.d/19394.bugfix | 2 +-