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

Port #5576 to dinsic

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 1517907898..e940e4183b 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -935,6 +935,7 @@ class RoomMemberHandler(object):
                 "sender": user.to_string(),
                 "state_key": token,
             },
+            ratelimit=False,
             txn_id=txn_id,
         )