diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-05-14 11:12:22 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-05-14 11:12:22 +0100 |
| commit | 9feee29d76555de7c2720ac661e7d9106dc51be3 (patch) | |
| tree | f52c39344606d29b6876f3ca916323e11fd83d6d /synapse/handlers/room_member.py | |
| parent | Merge commit 'a845abbf3' into matrix-org-hotfixes (diff) | |
| parent | 0.99.4rc1 (diff) | |
| download | synapse-9feee29d76555de7c2720ac661e7d9106dc51be3.tar.xz | |
Merge tag 'v0.99.4rc1' into matrix-org-hotfixes
v0.99.4rc1
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 0ec87b2da8..e11511d395 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -730,8 +730,9 @@ class RoomMemberHandler(object): Codes.FORBIDDEN, ) - # Check whether we'll be ratelimited - yield self.base_handler.ratelimit(requester, update=False) + # We need to rate limit *before* we send out any 3PID invites, so we + # can't just rely on the standard ratelimiting of events. + yield self.base_handler.ratelimit(requester) invitee = yield self._lookup_3pid( id_server, medium, address |