summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2022-10-26 17:16:21 +0100
committerErik Johnston <erik@matrix.org>2022-10-26 17:16:21 +0100
commit4bfff5a97a2b347473135a4557261d4ed13fedee (patch)
tree2e449a9c3bdfc752bee9843a0d51fc69e139e739
parentfix broken avatar checks when server_name contains a port (#13927) (diff)
downloadsynapse-erikj/create_room_ratelimit.tar.xz
Don't ratelimit twice erikj/create_room_ratelimit
-rw-r--r--synapse/handlers/room.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index cc1e5c8f97..9ecfb3cfef 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -559,7 +559,6 @@ class RoomCreationHandler:
             invite_list=[],
             initial_state=initial_state,
             creation_content=creation_content,
-            ratelimit=False,
         )
 
         # Transfer membership events
@@ -1037,7 +1036,6 @@ class RoomCreationHandler:
         room_alias: Optional[RoomAlias] = None,
         power_level_content_override: Optional[JsonDict] = None,
         creator_join_profile: Optional[JsonDict] = None,
-        ratelimit: bool = True,
     ) -> Tuple[int, str, int]:
         """Sends the initial events into a new room. Sends the room creation, membership,
         and power level events into the room sequentially, then creates and batches up the
@@ -1125,7 +1123,7 @@ class RoomCreationHandler:
             creator.user,
             room_id,
             "join",
-            ratelimit=ratelimit,
+            ratelimit=False,
             content=creator_join_profile,
             new_room=True,
             prev_event_ids=[last_sent_event_id],