simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2025-03-12 15:57:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

use website_email instead of website_from in spam-email

Browse source
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( LOG.d(
"Inform user %s about spam email sent by %s to alias %s", "Inform user %s about spam email sent by %s to alias %s",
user, user,
contact.website_from, contact.website_email,
alias.email, alias.email,
) )
send_email( send_email(
mailbox_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( render(
"transactional/spam-email.txt", "transactional/spam-email.txt",
name=user.name, name=user.name,
alias=alias, alias=alias,
website_from=contact.website_from,
website_email=contact.website_email, website_email=contact.website_email,
disable_alias_link=disable_alias_link, disable_alias_link=disable_alias_link,
refused_email_url=refused_email_url, refused_email_url=refused_email_url,
@ -729,7 +728,6 @@ def handle_spam(
"transactional/spam-email.html", "transactional/spam-email.html",
name=user.name, name=user.name,
alias=alias, alias=alias,
website_from=contact.website_from,
website_email=contact.website_email, website_email=contact.website_email,
disable_alias_link=disable_alias_link, disable_alias_link=disable_alias_link,
refused_email_url=refused_email_url, refused_email_url=refused_email_url,

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

@ -1,6 +1,6 @@
Hi {{name}} 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. In most of the cases, the email will be refused by your email provider.