Ver código fonte

use website_email instead of website_from in spam-email

Son NK 5 anos atrás
pai
commit
3a845af2fa
2 arquivos alterados com 3 adições e 5 exclusões
  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(
     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,

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

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