PR comments

This commit is contained in:
Adrià Casajús 2022-02-21 12:30:26 +01:00
parent b069f81920
commit 33163660f7
No known key found for this signature in database
GPG Key ID: F0033226A5AFC9B9
3 changed files with 4 additions and 8 deletions

View File

@ -38,7 +38,6 @@ from app.config import (
DKIM_SELECTOR,
DKIM_PRIVATE_KEY,
ALIAS_DOMAINS,
SUPPORT_NAME,
POSTFIX_SUBMISSION_TLS,
MAX_NB_EMAIL_FREE_PLAN,
MAX_ALERT_24H,
@ -296,7 +295,7 @@ def send_email(
msg[headers.CONTENT_TYPE] = "text/plain"
msg[headers.SUBJECT] = subject
msg[headers.FROM] = f"{SUPPORT_NAME} <{NOREPLY}>"
msg[headers.FROM] = f"{NOREPLY} <{NOREPLY}>"
msg[headers.TO] = to_email
msg_id_header = make_msgid()

View File

@ -2081,14 +2081,13 @@ def should_ignore(mail_from: str, rcpt_tos: List[str]) -> bool:
def send_no_reply_response(mail_from: str, msg: Message):
mailbox = Mailbox.get_by(email=mail_from)
user = User.get(mailbox.user_id)
if not user:
if not mailbox:
LOG.d("Unknown sender. Skipping reply from {}".format(NOREPLY))
return
send_email_at_most_times(
user,
mailbox.user,
ALERT_TO_NOREPLY,
user.email,
mailbox.user.email,
"Auto: {}".format(msg[headers.SUBJECT] or "No subject"),
render("transactional/noreply.text.jinja2"),
)

View File

@ -2,6 +2,4 @@
{% block content %}
You have been unsubscribed from SimpleLogin newsletter.
We would love to know why do you want to unsubscribe from our communication.
{% endblock %}