summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-28 16:04:05 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-06-28 16:04:05 +0100
commit15d9fc31bd549e2b9c04f96a0d3e8938c1bdc6a5 (patch)
tree24751bfc7110517581bc8ddc6a1032233adff5d8 /synapse
parentChangelog (diff)
downloadsynapse-15d9fc31bd549e2b9c04f96a0d3e8938c1bdc6a5.tar.xz
Only ratelimit when sending the email
If we do the opposite, an event can arrive after or while sending the email and the 3PID invite event will get ratelimited.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/room_member.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index c860acf970..66b05b4732 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -676,7 +676,7 @@ class RoomMemberHandler(object):
 
         # 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, update=False)
+        yield self.base_handler.ratelimit(requester)
 
         can_invite = yield self.third_party_event_rules.check_threepid_can_be_invited(
             medium, address, room_id
@@ -823,6 +823,7 @@ class RoomMemberHandler(object):
                 "sender": user.to_string(),
                 "state_key": token,
             },
+            ratelimit=False,
             txn_id=txn_id,
         )