1
0

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.
This commit is contained in:
Brendan Abolivier
2019-06-28 16:04:05 +01:00
parent f304996c61
commit a7a8bbf502
+2 -1
View File
@@ -773,7 +773,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,
@@ -935,6 +935,7 @@ class RoomMemberHandler(object):
"sender": user.to_string(),
"state_key": token,
},
ratelimit=False,
txn_id=txn_id,
)