summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-28 17:43:48 +0100
committerGitHub <noreply@github.com>2019-06-28 17:43:48 +0100
commitc7ff297dde060dda7ba6b5abd8671ddcc745d97c (patch)
tree8c0a8cf52684594fcb1cb2b78f209e2676a407b1 /synapse/handlers
parentDon't log GC 0s at INFO (#5557) (diff)
parentOnly ratelimit when sending the email (diff)
downloadsynapse-c7ff297dde060dda7ba6b5abd8671ddcc745d97c.tar.xz
Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit
Don't update the ratelimiter before sending a 3PID invite
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room_member.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 4d6e883802..66b05b4732 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -823,6 +823,7 @@ class RoomMemberHandler(object):
                 "sender": user.to_string(),
                 "state_key": token,
             },
+            ratelimit=False,
             txn_id=txn_id,
         )