From a142a430d23dd97d0c68bee56d544d2fbf3f79a6 Mon Sep 17 00:00:00 2001 From: Son Date: Thu, 16 Dec 2021 10:32:10 +0100 Subject: [PATCH] use sl_sendmail instead of smtp.sendmail --- app/email_utils.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/email_utils.py b/app/email_utils.py index 05fd5492..4137a95a 100644 --- a/app/email_utils.py +++ b/app/email_utils.py @@ -299,12 +299,10 @@ def send_email( email_domain = SUPPORT_EMAIL[SUPPORT_EMAIL.find("@") + 1 :] add_dkim_signature(msg, email_domain) - msg_raw = to_bytes(msg) - transaction = TransactionalEmail.create(email=to_email, commit=True) # use a different envelope sender for each transactional email (aka VERP) - smtp.sendmail(TRANSACTIONAL_BOUNCE_EMAIL.format(transaction.id), to_email, msg_raw) + sl_sendmail(TRANSACTIONAL_BOUNCE_EMAIL.format(transaction.id), to_email, msg) def send_email_with_rate_control( @@ -1263,9 +1261,9 @@ def sl_sendmail( from_addr, to_addr, msg: Message, - mail_options, - rcpt_options, - is_forward: bool, + mail_options=(), + rcpt_options=(), + is_forward: bool = False, can_retry=True, ): """replace smtp.sendmail"""