diff --git a/synapse/handlers/room_summary.py b/synapse/handlers/room_summary.py
index b2cfe537df..8181cc0b52 100644
--- a/synapse/handlers/room_summary.py
+++ b/synapse/handlers/room_summary.py
@@ -36,9 +36,8 @@ from synapse.api.errors import (
SynapseError,
UnsupportedRoomVersionError,
)
-from synapse.api.ratelimiting import Ratelimiter
from synapse.events import EventBase
-from synapse.types import JsonDict, Requester
+from synapse.types import JsonDict
from synapse.util.caches.response_cache import ResponseCache
if TYPE_CHECKING:
@@ -94,9 +93,6 @@ class RoomSummaryHandler:
self._event_serializer = hs.get_event_client_serializer()
self._server_name = hs.hostname
self._federation_client = hs.get_federation_client()
- self._ratelimiter = Ratelimiter(
- store=self._store, clock=hs.get_clock(), rate_hz=5, burst_count=10
- )
# If a user tries to fetch the same page multiple times in quick succession,
# only process the first attempt and return its result to subsequent requests.
@@ -253,7 +249,7 @@ class RoomSummaryHandler:
async def get_room_hierarchy(
self,
- requester: Requester,
+ requester: str,
requested_room_id: str,
suggested_only: bool = False,
max_depth: Optional[int] = None,
@@ -280,8 +276,6 @@ class RoomSummaryHandler:
Returns:
The JSON hierarchy dictionary.
"""
- await self._ratelimiter.ratelimit(requester)
-
# If a user tries to fetch the same page multiple times in quick succession,
# only process the first attempt and return its result to subsequent requests.
#
@@ -289,7 +283,7 @@ class RoomSummaryHandler:
# to process multiple requests for the same page will result in errors.
return await self._pagination_response_cache.wrap(
(
- requester.user.to_string(),
+ requester,
requested_room_id,
suggested_only,
max_depth,
@@ -297,7 +291,7 @@ class RoomSummaryHandler:
from_token,
),
self._get_room_hierarchy,
- requester.user.to_string(),
+ requester,
requested_room_id,
suggested_only,
max_depth,
|
