summary refs log tree commit diff
path: root/packages
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2025-08-12 07:42:20 +0200
committerRory& <root@rory.gay>2025-08-12 07:42:20 +0200
commit6ac00c281f6801a1bec027a719d13b5f47e41aef (patch)
treee41fe091363eb97b8fdaacf7174593bd91d419e4 /packages
parentUse small channel temporarily (diff)
downloadRory-Open-Architecture-6ac00c281f6801a1bec027a719d13b5f47e41aef.tar.xz
Update inputs, rebase synapse patches
Diffstat (limited to 'packages')
-rw-r--r--packages/overlays/matrix-synapse/patches/0001-Fast-auth-links.patch12
-rw-r--r--packages/overlays/matrix-synapse/patches/0002-Hotfix-ignore-rejected-events-in-delayed_events.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0003-Add-too-much-logging-to-room-summary-over-federation.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0004-Log-entire-room-if-accessibility-check-fails.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0005-Log-policy-server-rejected-events.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0006-Use-parse_boolean-for-unredacted-content.patch8
-rw-r--r--packages/overlays/matrix-synapse/patches/0007-Expose-tombstone-in-room-admin-api.patch12
-rw-r--r--packages/overlays/matrix-synapse/patches/0008-fix-Always-recheck-messages-pagination-data-if-a-bac.patch32
-rw-r--r--packages/overlays/matrix-synapse/patches/0009-Fix-pagination-with-large-gaps-of-rejected-events.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0010-Fix-nix-flake.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0011-Fix-gitignore-to-ignore-.venv.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0012-Devenv-use-postgres-17.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0013-RequestRatelimiter-expose-can_do_action.patch4
-rw-r--r--packages/overlays/matrix-synapse/patches/0014-Add-bulk-send-events-endpoint.patch22
14 files changed, 67 insertions, 67 deletions
diff --git a/packages/overlays/matrix-synapse/patches/0001-Fast-auth-links.patch b/packages/overlays/matrix-synapse/patches/0001-Fast-auth-links.patch

index 7b91953..9e3e1f1 100644 --- a/packages/overlays/matrix-synapse/patches/0001-Fast-auth-links.patch +++ b/packages/overlays/matrix-synapse/patches/0001-Fast-auth-links.patch
@@ -1,4 +1,4 @@ -From 1b82f35b613e96c56bf18015e33f34328ad73188 Mon Sep 17 00:00:00 2001 +From 7ad0925b66afc3c43a607ec9df1ec8936d18f68f Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 22 Jul 2025 05:07:01 +0200 Subject: [PATCH 01/14] Fast auth links @@ -63,7 +63,7 @@ index 6188195614..79af139543 100644 def make_in_list_sql_clause( database_engine: BaseDatabaseEngine, diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py -index 46aa5902d8..026f0114ed 100644 +index 28d202ef0a..25997ee772 100644 --- a/synapse/storage/databases/main/event_federation.py +++ b/synapse/storage/databases/main/event_federation.py @@ -52,6 +52,7 @@ from synapse.storage.database import ( @@ -72,9 +72,9 @@ index 46aa5902d8..026f0114ed 100644 LoggingTransaction, + make_select_id_if_found_sql_clause, ) + from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore from synapse.storage.databases.main.events_worker import EventsWorkerStore - from synapse.storage.databases.main.signatures import SignatureWorkerStore -@@ -362,8 +363,7 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas +@@ -382,8 +383,7 @@ class EventFederationWorkerStore( sql = """ WITH RECURSIVE links(chain_id) AS ( SELECT @@ -84,7 +84,7 @@ index 46aa5902d8..026f0114ed 100644 UNION SELECT target_chain_id -@@ -380,8 +380,8 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas +@@ -400,8 +400,8 @@ class EventFederationWorkerStore( while chains_to_fetch: batch2 = tuple(itertools.islice(chains_to_fetch, 1000)) chains_to_fetch.difference_update(batch2) @@ -96,5 +96,5 @@ index 46aa5902d8..026f0114ed 100644 txn.execute(sql % (clause,), args) -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0002-Hotfix-ignore-rejected-events-in-delayed_events.patch b/packages/overlays/matrix-synapse/patches/0002-Hotfix-ignore-rejected-events-in-delayed_events.patch
index adc1b50..6a43260 100644 --- a/packages/overlays/matrix-synapse/patches/0002-Hotfix-ignore-rejected-events-in-delayed_events.patch +++ b/packages/overlays/matrix-synapse/patches/0002-Hotfix-ignore-rejected-events-in-delayed_events.patch
@@ -1,4 +1,4 @@ -From 346fb5899fa42d4604b7bf0261c5e1774e6d2c04 Mon Sep 17 00:00:00 2001 +From dd5889d527000a040b441efb2ee0df9513afb9a2 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Sun, 20 Apr 2025 00:30:29 +0200 Subject: [PATCH 02/14] Hotfix: ignore rejected events in delayed_events @@ -8,10 +8,10 @@ Subject: [PATCH 02/14] Hotfix: ignore rejected events in delayed_events 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/synapse/handlers/delayed_events.py b/synapse/handlers/delayed_events.py -index 80cb1cec9b..cb2a34ff73 100644 +index beb0e819c2..f6ed21ea92 100644 --- a/synapse/handlers/delayed_events.py +++ b/synapse/handlers/delayed_events.py -@@ -208,8 +208,13 @@ class DelayedEventsHandler: +@@ -211,8 +211,13 @@ class DelayedEventsHandler: ) event = await self._store.get_event( @@ -27,5 +27,5 @@ index 80cb1cec9b..cb2a34ff73 100644 next_send_ts = await self._store.cancel_delayed_state_events( -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0003-Add-too-much-logging-to-room-summary-over-federation.patch b/packages/overlays/matrix-synapse/patches/0003-Add-too-much-logging-to-room-summary-over-federation.patch
index c5a71ec..a718d84 100644 --- a/packages/overlays/matrix-synapse/patches/0003-Add-too-much-logging-to-room-summary-over-federation.patch +++ b/packages/overlays/matrix-synapse/patches/0003-Add-too-much-logging-to-room-summary-over-federation.patch
@@ -1,4 +1,4 @@ -From 929d1e329ec26d2e351591206a82c6e235660437 Mon Sep 17 00:00:00 2001 +From e0996b0c9944eb31f8332875fa670c81b8952ce0 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Wed, 23 Apr 2025 17:53:52 +0200 Subject: [PATCH 03/14] Add too much logging to room summary over federation @@ -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 1f322ac263..59b63b2e7c 100644 +index 838fee6a30..e99e43b3bf 100644 --- a/synapse/handlers/room_summary.py +++ b/synapse/handlers/room_summary.py -@@ -715,23 +715,55 @@ class RoomSummaryHandler: +@@ -717,23 +717,55 @@ class RoomSummaryHandler: """ # The API doesn't return the room version so assume that a # join rule of knock is valid. @@ -73,5 +73,5 @@ index 1f322ac263..59b63b2e7c 100644 # already be in the room (if it was a child room), or there might be a # pending invite, etc. -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0004-Log-entire-room-if-accessibility-check-fails.patch b/packages/overlays/matrix-synapse/patches/0004-Log-entire-room-if-accessibility-check-fails.patch
index 04c00c1..ec18f37 100644 --- a/packages/overlays/matrix-synapse/patches/0004-Log-entire-room-if-accessibility-check-fails.patch +++ b/packages/overlays/matrix-synapse/patches/0004-Log-entire-room-if-accessibility-check-fails.patch
@@ -1,4 +1,4 @@ -From 0ce933278f77e272e2cc894229a1178e1b4fb552 Mon Sep 17 00:00:00 2001 +From 215fd0c4c2e0bdf26241e66c871464d3638f7c83 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Wed, 23 Apr 2025 18:24:57 +0200 Subject: [PATCH 04/14] Log entire room if accessibility check fails @@ -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 59b63b2e7c..b65ccdb510 100644 +index e99e43b3bf..daf543bd43 100644 --- a/synapse/handlers/room_summary.py +++ b/synapse/handlers/room_summary.py -@@ -931,6 +931,10 @@ class RoomSummaryHandler: +@@ -933,6 +933,10 @@ class RoomSummaryHandler: if not room_entry or not await self._is_remote_room_accessible( requester, room_entry.room_id, room_entry.room ): @@ -24,5 +24,5 @@ index 59b63b2e7c..b65ccdb510 100644 room = dict(room_entry.room) -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0005-Log-policy-server-rejected-events.patch b/packages/overlays/matrix-synapse/patches/0005-Log-policy-server-rejected-events.patch
index 7c6b002..5259bb6 100644 --- a/packages/overlays/matrix-synapse/patches/0005-Log-policy-server-rejected-events.patch +++ b/packages/overlays/matrix-synapse/patches/0005-Log-policy-server-rejected-events.patch
@@ -1,4 +1,4 @@ -From 0b5d4c8104bf25f7bbb4e4e7db229742f04199b6 Mon Sep 17 00:00:00 2001 +From eb1edb3363a9d66115e756043cb93fa64c28f5d3 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 05:21:46 +0200 Subject: [PATCH 05/14] Log policy server rejected events @@ -26,5 +26,5 @@ index 170c477d6f..df5585e4ee 100644 return True # default allow -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0006-Use-parse_boolean-for-unredacted-content.patch b/packages/overlays/matrix-synapse/patches/0006-Use-parse_boolean-for-unredacted-content.patch
index 45fbd2c..ef55a96 100644 --- a/packages/overlays/matrix-synapse/patches/0006-Use-parse_boolean-for-unredacted-content.patch +++ b/packages/overlays/matrix-synapse/patches/0006-Use-parse_boolean-for-unredacted-content.patch
@@ -1,4 +1,4 @@ -From 07d72fd39ea3044577322647d5ed1dd8cb6f77d9 Mon Sep 17 00:00:00 2001 +From 1fd2cf63b7a083f90e53d5cfc1bcfcffdc3b60dd Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 06:14:26 +0200 Subject: [PATCH 06/14] Use parse_boolean for unredacted content @@ -8,10 +8,10 @@ Subject: [PATCH 06/14] Use parse_boolean for unredacted content 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py -index 4600a87778..e838341fde 100644 +index 6b0deda0df..9333f486f1 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py -@@ -915,10 +915,9 @@ class RoomEventServlet(RestServlet): +@@ -927,10 +927,9 @@ class RoomEventServlet(RestServlet): requester = await self.auth.get_user_by_req(request, allow_guest=True) include_unredacted_content = self.msc2815_enabled and ( @@ -25,5 +25,5 @@ index 4600a87778..e838341fde 100644 == "true" ) -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0007-Expose-tombstone-in-room-admin-api.patch b/packages/overlays/matrix-synapse/patches/0007-Expose-tombstone-in-room-admin-api.patch
index f331512..3e33470 100644 --- a/packages/overlays/matrix-synapse/patches/0007-Expose-tombstone-in-room-admin-api.patch +++ b/packages/overlays/matrix-synapse/patches/0007-Expose-tombstone-in-room-admin-api.patch
@@ -1,4 +1,4 @@ -From d3edb4aa9a225f521fdbc406c187fd40343b3963 Mon Sep 17 00:00:00 2001 +From 8fa7b06fdc31b3675c01d3e33fa13db3f56039c6 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Tue, 27 May 2025 06:37:52 +0200 Subject: [PATCH 07/14] Expose tombstone in room admin api @@ -10,7 +10,7 @@ Subject: [PATCH 07/14] Expose tombstone in room admin api 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py -index f8c5bf18d4..adac1f0362 100644 +index efcc60a2de..fe316c4d9d 100644 --- a/synapse/rest/admin/rooms.py +++ b/synapse/rest/admin/rooms.py @@ -251,6 +251,10 @@ class ListRoomRestServlet(RestServlet): @@ -33,10 +33,10 @@ index f8c5bf18d4..adac1f0362 100644 response = { diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py -index e838341fde..f61152c35b 100644 +index 9333f486f1..c731f83fe2 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py -@@ -919,7 +919,6 @@ class RoomEventServlet(RestServlet): +@@ -931,7 +931,6 @@ class RoomEventServlet(RestServlet): request, "fi.mau.msc2815.include_unredacted_content" ) @@ -45,7 +45,7 @@ index e838341fde..f61152c35b 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 58451d3ff1..66b79db4ed 100644 +index 604365badf..511550f2b4 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -610,6 +610,7 @@ class RoomWorkerStore(CacheInvalidationWorkerStore): @@ -110,5 +110,5 @@ index 58451d3ff1..66b79db4ed 100644 async def get_ratelimit_for_user(self, user_id: str) -> Optional[RatelimitOverride]: """Check if there are any overrides for ratelimiting for the given user -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0008-fix-Always-recheck-messages-pagination-data-if-a-bac.patch b/packages/overlays/matrix-synapse/patches/0008-fix-Always-recheck-messages-pagination-data-if-a-bac.patch
index 724c134..562b4e3 100644 --- a/packages/overlays/matrix-synapse/patches/0008-fix-Always-recheck-messages-pagination-data-if-a-bac.patch +++ b/packages/overlays/matrix-synapse/patches/0008-fix-Always-recheck-messages-pagination-data-if-a-bac.patch
@@ -1,4 +1,4 @@ -From afecddceaa6ece4cf797ce27e226a99acb8e8a6d Mon Sep 17 00:00:00 2001 +From dab8c4190da5acdd7c7046a9cef664024cf128d3 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 08/14] fix: Always recheck `/messages` pagination data if a @@ -10,10 +10,10 @@ Subject: [PATCH 08/14] fix: Always recheck `/messages` pagination data if a 2 files changed, 34 insertions(+), 37 deletions(-) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py -index 015fb3edca..a0bc955121 100644 +index c709ed2c63..543f06e76c 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py -@@ -211,7 +211,7 @@ class FederationHandler: +@@ -194,7 +194,7 @@ class FederationHandler: @tag_args async def maybe_backfill( self, room_id: str, current_depth: int, limit: int, record_time: bool = True @@ -22,7 +22,7 @@ index 015fb3edca..a0bc955121 100644 """Checks the database to see if we should backfill before paginating, and if so do. -@@ -225,8 +225,6 @@ class FederationHandler: +@@ -208,8 +208,6 @@ class FederationHandler: should back paginate. record_time: Whether to record the time it takes to backfill. @@ -31,7 +31,7 @@ index 015fb3edca..a0bc955121 100644 """ # Starting the processing time here so we can include the room backfill # linearizer lock queue in the timing -@@ -252,7 +250,7 @@ class FederationHandler: +@@ -235,7 +233,7 @@ class FederationHandler: limit: int, *, processing_start_time: Optional[int], @@ -40,7 +40,7 @@ index 015fb3edca..a0bc955121 100644 """ Checks whether the `current_depth` is at or approaching any backfill points in the room and if so, will backfill. We only care about -@@ -326,7 +324,7 @@ class FederationHandler: +@@ -309,7 +307,7 @@ class FederationHandler: limit=1, ) if not have_later_backfill_points: @@ -49,7 +49,7 @@ index 015fb3edca..a0bc955121 100644 logger.debug( "_maybe_backfill_inner: all backfill points are *after* current depth. Trying again with later backfill points." -@@ -346,15 +344,15 @@ class FederationHandler: +@@ -329,15 +327,15 @@ class FederationHandler: ) # We return `False` because we're backfilling in the background and there is # no new events immediately for the caller to know about yet. @@ -68,7 +68,7 @@ index 015fb3edca..a0bc955121 100644 # If we're approaching an extremity we trigger a backfill, otherwise we # no-op. -@@ -373,7 +371,7 @@ class FederationHandler: +@@ -356,7 +354,7 @@ class FederationHandler: current_depth, limit, ) @@ -77,7 +77,7 @@ index 015fb3edca..a0bc955121 100644 # For performance's sake, we only want to paginate from a particular extremity # if we can actually see the events we'll get. Otherwise, we'd just spend a lot -@@ -441,7 +439,7 @@ class FederationHandler: +@@ -424,7 +422,7 @@ class FederationHandler: logger.debug( "_maybe_backfill_inner: found no extremities which would be visible" ) @@ -86,7 +86,7 @@ index 015fb3edca..a0bc955121 100644 logger.debug( "_maybe_backfill_inner: extremities_to_request %s", extremities_to_request -@@ -464,7 +462,7 @@ class FederationHandler: +@@ -447,7 +445,7 @@ class FederationHandler: ) ) @@ -95,7 +95,7 @@ index 015fb3edca..a0bc955121 100644 # TODO: Should we try multiple of these at a time? # Number of contacted remote homeservers that have denied our backfill -@@ -487,7 +485,7 @@ class FederationHandler: +@@ -470,7 +468,7 @@ class FederationHandler: # If this succeeded then we probably already have the # appropriate stuff. # TODO: We can probably do something more intelligent here. @@ -104,7 +104,7 @@ index 015fb3edca..a0bc955121 100644 except NotRetryingDestination as e: logger.info("_maybe_backfill_inner: %s", e) continue -@@ -511,7 +509,7 @@ class FederationHandler: +@@ -494,7 +492,7 @@ class FederationHandler: ) denied_count += 1 if denied_count >= max_denied_count: @@ -113,7 +113,7 @@ index 015fb3edca..a0bc955121 100644 continue logger.info("Failed to backfill from %s because %s", dom, e) -@@ -527,7 +525,7 @@ class FederationHandler: +@@ -510,7 +508,7 @@ class FederationHandler: ) denied_count += 1 if denied_count >= max_denied_count: @@ -122,7 +122,7 @@ index 015fb3edca..a0bc955121 100644 continue logger.info("Failed to backfill from %s because %s", dom, e) -@@ -539,7 +537,7 @@ class FederationHandler: +@@ -522,7 +520,7 @@ class FederationHandler: logger.exception("Failed to backfill from %s because %s", dom, e) continue @@ -131,7 +131,7 @@ index 015fb3edca..a0bc955121 100644 # If we have the `processing_start_time`, then we can make an # observation. We wouldn't have the `processing_start_time` in the case -@@ -551,14 +549,9 @@ class FederationHandler: +@@ -534,14 +532,9 @@ class FederationHandler: (processing_end_time - processing_start_time) / 1000 ) @@ -200,5 +200,5 @@ index 4070b74b7a..81cda38549 100644 # Otherwise, we can backfill in the background for eventual # consistency's sake but we don't need to block the client waiting -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0009-Fix-pagination-with-large-gaps-of-rejected-events.patch b/packages/overlays/matrix-synapse/patches/0009-Fix-pagination-with-large-gaps-of-rejected-events.patch
index e249252..d52bc05 100644 --- a/packages/overlays/matrix-synapse/patches/0009-Fix-pagination-with-large-gaps-of-rejected-events.patch +++ b/packages/overlays/matrix-synapse/patches/0009-Fix-pagination-with-large-gaps-of-rejected-events.patch
@@ -1,4 +1,4 @@ -From 2f2dd65326b8a8dc6b7ac99dbe7476abb2163469 Mon Sep 17 00:00:00 2001 +From 683be37ce51d7355b25384942c44c5b39a13b11f 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 09/14] Fix pagination with large gaps of rejected events @@ -46,5 +46,5 @@ index 81cda38549..365c9cabcb 100644 # we have reached the end of the available events. # In that case we do not return end, to tell the client -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0010-Fix-nix-flake.patch b/packages/overlays/matrix-synapse/patches/0010-Fix-nix-flake.patch
index a2bb1ed..d8f14e3 100644 --- a/packages/overlays/matrix-synapse/patches/0010-Fix-nix-flake.patch +++ b/packages/overlays/matrix-synapse/patches/0010-Fix-nix-flake.patch
@@ -1,4 +1,4 @@ -From 448de6ea7bfe1c6073726f517988e5deeb510861 Mon Sep 17 00:00:00 2001 +From a1216b4353f621ee80b3dd9acf25241af5c4d7fd Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Mon, 9 Jun 2025 17:38:34 +0200 Subject: [PATCH 10/14] Fix nix flake @@ -185,5 +185,5 @@ index 4ff6518aed..76b3c1a4b0 100644 # over the 'synapse' database. services.postgres.initialScript = '' -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0011-Fix-gitignore-to-ignore-.venv.patch b/packages/overlays/matrix-synapse/patches/0011-Fix-gitignore-to-ignore-.venv.patch
index f627abc..292eaf3 100644 --- a/packages/overlays/matrix-synapse/patches/0011-Fix-gitignore-to-ignore-.venv.patch +++ b/packages/overlays/matrix-synapse/patches/0011-Fix-gitignore-to-ignore-.venv.patch
@@ -1,4 +1,4 @@ -From e1b50954048039a23c538cd260644ccc63d82941 Mon Sep 17 00:00:00 2001 +From 2158f1b2759f571df4fef6b35a897e4ab82525b0 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Mon, 9 Jun 2025 17:46:10 +0200 Subject: [PATCH 11/14] Fix gitignore to ignore .venv @@ -20,5 +20,5 @@ index e333f2320b..3aec96e75e 100644 /logs /media_store/ -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0012-Devenv-use-postgres-17.patch b/packages/overlays/matrix-synapse/patches/0012-Devenv-use-postgres-17.patch
index 0e78105..8752404 100644 --- a/packages/overlays/matrix-synapse/patches/0012-Devenv-use-postgres-17.patch +++ b/packages/overlays/matrix-synapse/patches/0012-Devenv-use-postgres-17.patch
@@ -1,4 +1,4 @@ -From 8fefc1ece0f73ab4e4867cbb4cc1511dc7faa56f Mon Sep 17 00:00:00 2001 +From 645ca625e111a563720b93d6b2c738631c4769c2 Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Fri, 25 Jul 2025 08:25:28 +0200 Subject: [PATCH 12/14] Devenv: use postgres 17 @@ -20,5 +20,5 @@ index 76b3c1a4b0..cc41490a41 100644 # On the first invocation of `devenv up`, create a database for # Synapse to store data in. -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0013-RequestRatelimiter-expose-can_do_action.patch b/packages/overlays/matrix-synapse/patches/0013-RequestRatelimiter-expose-can_do_action.patch
index 2ad8e55..e48072a 100644 --- a/packages/overlays/matrix-synapse/patches/0013-RequestRatelimiter-expose-can_do_action.patch +++ b/packages/overlays/matrix-synapse/patches/0013-RequestRatelimiter-expose-can_do_action.patch
@@ -1,4 +1,4 @@ -From 4b62d4e914d8ff7e21bcfbbc6572f1f2a363e066 Mon Sep 17 00:00:00 2001 +From 0ed142d0be333116e52586206e7b3dd2faf5c95e Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Fri, 25 Jul 2025 08:26:15 +0200 Subject: [PATCH 13/14] RequestRatelimiter: expose can_do_action @@ -91,5 +91,5 @@ index 509ef6b2c1..5f22089a6b 100644 + n_actions=n_actions, + ) -- -2.49.0 +2.50.1 diff --git a/packages/overlays/matrix-synapse/patches/0014-Add-bulk-send-events-endpoint.patch b/packages/overlays/matrix-synapse/patches/0014-Add-bulk-send-events-endpoint.patch
index fdd6030..cdbbbd7 100644 --- a/packages/overlays/matrix-synapse/patches/0014-Add-bulk-send-events-endpoint.patch +++ b/packages/overlays/matrix-synapse/patches/0014-Add-bulk-send-events-endpoint.patch
@@ -1,4 +1,4 @@ -From 452f38800dd00b8686543099d6a085f9b4210687 Mon Sep 17 00:00:00 2001 +From 2d59d7575eb589bfd84808dd72c309a08151d6ba Mon Sep 17 00:00:00 2001 From: Rory& <root@rory.gay> Date: Sat, 26 Jul 2025 09:50:56 +0200 Subject: [PATCH 14/14] Add bulk send events endpoint @@ -9,7 +9,7 @@ Subject: [PATCH 14/14] Add bulk send events endpoint 2 files changed, 119 insertions(+), 1 deletion(-) diff --git a/synapse/rest/client/capabilities.py b/synapse/rest/client/capabilities.py -index 8f3193fb47..7220b75006 100644 +index a279db1cc5..5e18750e15 100644 --- a/synapse/rest/client/capabilities.py +++ b/synapse/rest/client/capabilities.py @@ -74,6 +74,9 @@ class CapabilitiesRestServlet(RestServlet): @@ -23,7 +23,7 @@ index 8f3193fb47..7220b75006 100644 } diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py -index f61152c35b..19ba13dd64 100644 +index c731f83fe2..df29d32495 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -23,10 +23,12 @@ @@ -39,15 +39,15 @@ index f61152c35b..19ba13dd64 100644 from prometheus_client.core import Histogram -@@ -44,6 +46,7 @@ from synapse.api.errors import ( - UnredactedContentDeletedError, +@@ -49,6 +51,7 @@ from synapse.events.utils import ( + format_event_for_client_v2, + serialize_event, ) - from synapse.api.filtering import Filter +from synapse.events import EventBase - from synapse.events.utils import SerializeEventConfig, format_event_for_client_v2 from synapse.http.server import HttpServer from synapse.http.servlet import ( -@@ -469,7 +472,6 @@ class RoomSendEventRestServlet(TransactionRestServlet): + ResolveRoomIdMixin, +@@ -481,7 +484,6 @@ class RoomSendEventRestServlet(TransactionRestServlet): txn_id, ) @@ -55,7 +55,7 @@ index f61152c35b..19ba13dd64 100644 def _parse_request_delay( request: SynapseRequest, max_delay: Optional[int], -@@ -1610,6 +1612,118 @@ class RoomSummaryRestServlet(ResolveRoomIdMixin, RestServlet): +@@ -1622,6 +1624,118 @@ class RoomSummaryRestServlet(ResolveRoomIdMixin, RestServlet): remote_room_hosts, ) @@ -174,7 +174,7 @@ index f61152c35b..19ba13dd64 100644 def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: RoomStateEventRestServlet(hs).register(http_server) -@@ -1619,6 +1733,7 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None: +@@ -1631,6 +1745,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) @@ -183,5 +183,5 @@ index f61152c35b..19ba13dd64 100644 RoomStateRestServlet(hs).register(http_server) RoomRedactEventRestServlet(hs).register(http_server) -- -2.49.0 +2.50.1