diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-28 17:43:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 17:43:48 +0100 |
| commit | c7ff297dde060dda7ba6b5abd8671ddcc745d97c (patch) | |
| tree | 8c0a8cf52684594fcb1cb2b78f209e2676a407b1 | |
| parent | Don't log GC 0s at INFO (#5557) (diff) | |
| parent | Only ratelimit when sending the email (diff) | |
| download | synapse-c7ff297dde060dda7ba6b5abd8671ddcc745d97c.tar.xz | |
Merge pull request #5576 from matrix-org/babolivier/3pid-invite-ratelimit
Don't update the ratelimiter before sending a 3PID invite
| -rw-r--r-- | changelog.d/5576.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/room_member.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/5576.bugfix b/changelog.d/5576.bugfix new file mode 100644 index 0000000000..c1ba5581f2 --- /dev/null +++ b/changelog.d/5576.bugfix @@ -0,0 +1 @@ +Fix a bug that would cause invited users to receive several emails for a single 3PID invite in case the inviter is rate limited. 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, ) |