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

babolivier · web-flow · commit 78b737ff7128 · 2019-06-28T18:23:53.000+01:00
Port #5576 to dinsic
diff --git a/changelog.d/5576.bugfix 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
@@ -935,6 +935,7 @@ def _make_and_store_3pid_invite(
                 "sender": user.to_string(),
                 "state_key": token,
             },
+            ratelimit=False,
             txn_id=txn_id,
         )
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`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.`