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

use website_email instead of website_from in spam-email

This commit is contained in:
Son NK 2020-04-05 12:00:01 +02:00
parent a081298756
commit 3a845af2fa
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
email_handler.py
View File

@ -710,17 +710,16 @@ def handle_spam(
LOG.d(
"Inform user %s about spam email sent by %s to alias %s",
user,
contact.website_from,
contact.website_email,
alias.email,
)
send_email(
mailbox_email,
f"Email from {contact.website_from} to {alias.email} is detected as spam",
f"Email from {contact.website_email} to {alias.email} is detected as spam",
render(
"transactional/spam-email.txt",
name=user.name,
alias=alias,
website_from=contact.website_from,
website_email=contact.website_email,
disable_alias_link=disable_alias_link,
refused_email_url=refused_email_url,
@ -729,7 +728,6 @@ def handle_spam(
"transactional/spam-email.html",
name=user.name,
alias=alias,
website_from=contact.website_from,
website_email=contact.website_email,
disable_alias_link=disable_alias_link,
refused_email_url=refused_email_url,

2
templates/emails/transactional/spam-email.txt
View File

@ -1,6 +1,6 @@
Hi {{name}}
An email sent to your alias {{alias.email}} from {{website_from}} is detected as spam by our Spam Detection Engine (SpamAssassin).
An email sent to your alias {{alias.email}} from {{website_email}} is detected as spam by our Spam Detection Engine (SpamAssassin).
In most of the cases, the email will be refused by your email provider.