Merge pull request #5577 from matrix-org/babolivier/3pid-invite-ratelimit

Port #5576 to dinsic
This commit is contained in:
Brendan Abolivier 2019-06-28 18:23:53 +01:00 committed by GitHub
commit 78b737ff71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

1
changelog.d/5576.bugfix Normal file
View File

@ -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.

View File

@ -935,6 +935,7 @@ class RoomMemberHandler(object):
"sender": user.to_string(),
"state_key": token,
},
ratelimit=False,
txn_id=txn_id,
)