Parcourir la source

use website_email instead of website_from in spam-email

Son NK il y a 5 ans
Parent
commit
3a845af2fa
2 fichiers modifiés avec 3 ajouts et 5 suppressions
  1. 2 4
      email_handler.py
  2. 1 1
      templates/emails/transactional/spam-email.txt

+ 2 - 4
email_handler.py

@@ -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,

+ 1 - 1
templates/emails/transactional/spam-email.txt

@@ -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.