send raw message instead of using EmailMessage object

This commit is contained in:
Son NK 2019-12-07 23:25:55 +01:00
parent ef888288a6
commit 1435a77130
1 changed files with 17 additions and 6 deletions

View File

@ -153,13 +153,24 @@ class MailHandler:
envelope.rcpt_options,
)
smtp.send_message(
msg,
from_addr=forward_email.reply_email,
to_addrs=[user_email], # user personal email
mail_options=envelope.mail_options,
rcpt_options=envelope.rcpt_options,
# smtp.send_message has UnicodeEncodeErroremail issue
# encode message raw directly instead
msg_raw = msg.as_string().encode()
smtp.sendmail(
forward_email.reply_email,
user_email,
msg_raw,
envelope.mail_options,
envelope.rcpt_options,
)
# smtp.send_message(
# msg,
# from_addr=forward_email.reply_email,
# to_addrs=[user_email], # user personal email
# mail_options=envelope.mail_options,
# rcpt_options=envelope.rcpt_options,
# )
else:
LOG.d("%s is disabled, do not forward", gen_email)
forward_log.blocked = True