Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle case original_message_id can be None

This commit is contained in:
Son 2021-10-28 18:41:36 +02:00
parent 5f6ad21e85
commit cf8150b996
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
email_handler.py
View File

@ -1053,10 +1053,12 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
if not MessageIDMatching.get_by( if not MessageIDMatching.get_by(
sl_message_id=sl_message_id sl_message_id=sl_message_id
) and not MessageIDMatching.get_by(original_message_id=original_message_id): ) and not MessageIDMatching.get_by(original_message_id=original_message_id):
MessageIDMatching.create( # original_message_id might be None
sl_message_id=sl_message_id, if original_message_id:
original_message_id=original_message_id, MessageIDMatching.create(
) sl_message_id=sl_message_id,
original_message_id=original_message_id,
)
else: else:
LOG.w( LOG.w(
"Same SL or Original Message ID has been added before %s %s", "Same SL or Original Message ID has been added before %s %s",
@ -1297,7 +1299,7 @@ def handle_bounce_forward_phase(msg: Message, email_log: EmailLog):
alias, alias,
) )
disable_alias_link = f"{URL}/dashboard/unsubscribe/{alias.id}" disable_alias_link = f"{URL}/dashboard/unsubscribe/{alias.id}"
block_sender_link = f"{URL}/dashboard/alias_contact_manager/{alias.id}?highlight_contact_id={contact.id}" block_sender_link = f"{URL}/dashboard/alias_contact_manager/{alias.id}?highlight_contact_id={contact.id}"
send_email_with_rate_control( send_email_with_rate_control(
user, user,
ALERT_BOUNCE_EMAIL, ALERT_BOUNCE_EMAIL,