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

…imit Port #5576 to dinsic
matrix-org · Jun 28, 2019 · 78b737f · 78b737f
2 parents ee0ee97 + a7a8bbf
commit 78b737f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
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 @@
		Fix a bug that would cause invited users to receive several emails for a single 3PID invite in case the inviter is rate limited.