diff --git a/packages/overlays/matrix-synapse/patches/0014-Slight-performance-increase-when-using-the-ratelimit.patch b/packages/overlays/matrix-synapse/patches/0014-Slight-performance-increase-when-using-the-ratelimit.patch
deleted file mode 100644
index e6c87b2..0000000
--- a/packages/overlays/matrix-synapse/patches/0014-Slight-performance-increase-when-using-the-ratelimit.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From ad140130cc3db503de3fd15aa2923417f46b700b Mon Sep 17 00:00:00 2001
-From: Erik Johnston <erikj@element.io>
-Date: Tue, 29 Apr 2025 14:08:22 +0100
-Subject: [PATCH 14/74] Slight performance increase when using the ratelimiter
- (#18369)
-
-See the commits.
----
- changelog.d/18369.misc | 1 +
- synapse/api/ratelimiting.py | 19 ++++++++-----------
- synapse/rest/client/sync.py | 7 +++----
- tests/api/test_ratelimiting.py | 4 +---
- 4 files changed, 13 insertions(+), 18 deletions(-)
- create mode 100644 changelog.d/18369.misc
-
-diff --git a/changelog.d/18369.misc b/changelog.d/18369.misc
-new file mode 100644
-index 0000000000..f4c0e5f006
---- /dev/null
-+++ b/changelog.d/18369.misc
-@@ -0,0 +1 @@
-+Slight performance increase when using the ratelimiter.
-diff --git a/synapse/api/ratelimiting.py b/synapse/api/ratelimiting.py
-index 229329a5ae..8665b3b765 100644
---- a/synapse/api/ratelimiting.py
-+++ b/synapse/api/ratelimiting.py
-@@ -20,8 +20,7 @@
- #
- #
-
--from collections import OrderedDict
--from typing import Hashable, Optional, Tuple
-+from typing import Dict, Hashable, Optional, Tuple
-
- from synapse.api.errors import LimitExceededError
- from synapse.config.ratelimiting import RatelimitSettings
-@@ -80,12 +79,14 @@ class Ratelimiter:
- self.store = store
- self._limiter_name = cfg.key
-
-- # An ordered dictionary representing the token buckets tracked by this rate
-+ # A dictionary representing the token buckets tracked by this rate
- # limiter. Each entry maps a key of arbitrary type to a tuple representing:
- # * The number of tokens currently in the bucket,
- # * The time point when the bucket was last completely empty, and
- # * The rate_hz (leak rate) of this particular bucket.
-- self.actions: OrderedDict[Hashable, Tuple[float, float, float]] = OrderedDict()
-+ self.actions: Dict[Hashable, Tuple[float, float, float]] = {}
-+
-+ self.clock.looping_call(self._prune_message_counts, 60 * 1000)
-
- def _get_key(
- self, requester: Optional[Requester], key: Optional[Hashable]
-@@ -169,9 +170,6 @@ class Ratelimiter:
- rate_hz = rate_hz if rate_hz is not None else self.rate_hz
- burst_count = burst_count if burst_count is not None else self.burst_count
-
-- # Remove any expired entries
-- self._prune_message_counts(time_now_s)
--
- # Check if there is an existing count entry for this key
- action_count, time_start, _ = self._get_action_counts(key, time_now_s)
-
-@@ -246,13 +244,12 @@ class Ratelimiter:
- action_count, time_start, rate_hz = self._get_action_counts(key, time_now_s)
- self.actions[key] = (action_count + n_actions, time_start, rate_hz)
-
-- def _prune_message_counts(self, time_now_s: float) -> None:
-+ def _prune_message_counts(self) -> None:
- """Remove message count entries that have not exceeded their defined
- rate_hz limit
--
-- Args:
-- time_now_s: The current time
- """
-+ time_now_s = self.clock.time()
-+
- # We create a copy of the key list here as the dictionary is modified during
- # the loop
- for key in list(self.actions.keys()):
-diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py
-index 4fb9c0c8e7..bac02122d0 100644
---- a/synapse/rest/client/sync.py
-+++ b/synapse/rest/client/sync.py
-@@ -24,7 +24,7 @@ from collections import defaultdict
- from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, Tuple, Union
-
- from synapse.api.constants import AccountDataTypes, EduTypes, Membership, PresenceState
--from synapse.api.errors import Codes, LimitExceededError, StoreError, SynapseError
-+from synapse.api.errors import Codes, StoreError, SynapseError
- from synapse.api.filtering import FilterCollection
- from synapse.api.presence import UserPresenceState
- from synapse.api.ratelimiting import Ratelimiter
-@@ -248,9 +248,8 @@ class SyncRestServlet(RestServlet):
- await self._server_notices_sender.on_user_syncing(user.to_string())
-
- # ignore the presence update if the ratelimit is exceeded but do not pause the request
-- try:
-- await self._presence_per_user_limiter.ratelimit(requester, pause=0.0)
-- except LimitExceededError:
-+ allowed, _ = await self._presence_per_user_limiter.can_do_action(requester)
-+ if not allowed:
- affect_presence = False
- logger.debug("User set_presence ratelimit exceeded; ignoring it.")
- else:
-diff --git a/tests/api/test_ratelimiting.py b/tests/api/test_ratelimiting.py
-index a59e168db1..1a1cbde74e 100644
---- a/tests/api/test_ratelimiting.py
-+++ b/tests/api/test_ratelimiting.py
-@@ -220,9 +220,7 @@ class TestRatelimiter(unittest.HomeserverTestCase):
-
- self.assertIn("test_id_1", limiter.actions)
-
-- self.get_success_or_raise(
-- limiter.can_do_action(None, key="test_id_2", _time_now_s=10)
-- )
-+ self.reactor.advance(60)
-
- self.assertNotIn("test_id_1", limiter.actions)
-
---
-2.49.0
-
|
