diff options
| author | David Robertson <davidr@element.io> | 2022-07-11 20:58:12 +0100 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2022-07-11 21:09:20 +0100 |
| commit | 47acf465efe2c60d1cc8fb5fcc1be5cccfc0a7d6 (patch) | |
| tree | 5d488516284e0c080a7fdcffc65788ec69ca8a68 | |
| parent | Use `add_hashes_and_signatures_from_other_server` (diff) | |
| download | synapse-47acf465efe2c60d1cc8fb5fcc1be5cccfc0a7d6.tar.xz | |
Don't require `ratelimit` to notify for joins
| -rw-r--r-- | synapse/handlers/message.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index acef60075e..59f99ae8b5 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1512,22 +1512,20 @@ class EventCreationHandler: original_event and event.sender != original_event.sender ) - if event.type == EventTypes.Member and event.membership == Membership.JOIN: - ( - current_membership, - _, - ) = await self.store.get_local_current_membership_for_user_in_room( - event.state_key, event.room_id - ) - if current_membership != Membership.JOIN: - self._notifier.notify_user_joined_room( - event.event_id, event.room_id - ) - await self.request_ratelimiter.ratelimit( requester, is_admin_redaction=is_admin_redaction ) + if event.type == EventTypes.Member and event.membership == Membership.JOIN: + ( + current_membership, + _, + ) = await self.store.get_local_current_membership_for_user_in_room( + event.state_key, event.room_id + ) + if current_membership != Membership.JOIN: + self._notifier.notify_user_joined_room(event.event_id, event.room_id) + await self._maybe_kick_guest_users(event, context) if event.type == EventTypes.CanonicalAlias: |