Mirror/app-MAIL-temp
1
0
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-11-14 08:01:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactoring

Browse source
This commit is contained in:
Son NK 2020-08-21 10:18:58 +02:00
parent a3e052cc7b
commit 386fcbdc3a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
email_handler.py
View file

@ -453,7 +453,7 @@ async def forward_email_to_mailbox(
email_log.spam_status = spam_status email_log.spam_status = spam_status
db.session.commit() db.session.commit()
handle_spam(contact, alias, msg, user, mailbox.email, email_log) handle_spam(contact, alias, msg, user, mailbox, email_log)
return False, "550 SL E1 Email detected as spam" return False, "550 SL E1 Email detected as spam"
# create PGP email if needed # create PGP email if needed
@ -617,7 +617,7 @@ async def handle_reply(envelope, smtp: SMTP, msg: Message, rcpt_to: str) -> (boo
email_log.spam_status = spam_status email_log.spam_status = spam_status
db.session.commit() db.session.commit()
handle_spam(contact, alias, msg, user, mailbox.email, email_log, is_reply=True) handle_spam(contact, alias, msg, user, mailbox, email_log, is_reply=True)
return False, "550 SL E15 Email detected as spam" return False, "550 SL E15 Email detected as spam"
delete_header(msg, _IP_HEADER) delete_header(msg, _IP_HEADER)
@ -1005,7 +1005,7 @@ def handle_spam(
alias: Alias, alias: Alias,
msg: Message, msg: Message,
user: User, user: User,
mailbox_email: str, mailbox: Mailbox,
email_log: EmailLog, email_log: EmailLog,
is_reply=False, # whether the email is in forward or reply phase is_reply=False, # whether the email is in forward or reply phase
): ):
@ -1049,7 +1049,7 @@ def handle_spam(
send_email_with_rate_control( send_email_with_rate_control(
user, user,
ALERT_SPAM_EMAIL, ALERT_SPAM_EMAIL,
mailbox_email, mailbox.email,
f"Email from {contact.website_email} to {alias.email} is detected as spam", f"Email from {contact.website_email} to {alias.email} is detected as spam",
render( render(
"transactional/spam-email-reply-phase.txt", "transactional/spam-email-reply-phase.txt",
@ -1079,7 +1079,7 @@ def handle_spam(
send_email_with_rate_control( send_email_with_rate_control(
user, user,
ALERT_SPAM_EMAIL, ALERT_SPAM_EMAIL,
mailbox_email, mailbox.email,
f"Email from {contact.website_email} to {alias.email} is detected as spam", f"Email from {contact.website_email} to {alias.email} is detected as spam",
render( render(
"transactional/spam-email.txt", "transactional/spam-email.txt",