From d6df034ad045b20c548b977d8ec51b98c05e9110 Mon Sep 17 00:00:00 2001 From: jedi Date: Sat, 13 Jan 2024 03:31:17 +0100 Subject: [PATCH] quickfix for "Reply-To is noreply+None@domain.tld" --- core/mail/protocol.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/mail/protocol.py b/core/mail/protocol.py index e6d6ba1..27c8407 100644 --- a/core/mail/protocol.py +++ b/core/mail/protocol.py @@ -52,15 +52,15 @@ def collect_references(issue_thread): return references -def make_reply(reply_email, references=None, event=None, issue_thread=None): +def make_reply(reply_email, references=None, event=None): from email.message import EmailMessage from core.settings import MAIL_DOMAIN - event = event or "noreply" + event = event or "mail" reply = EmailMessage() reply["From"] = reply_email.sender reply["To"] = reply_email.recipient reply["Subject"] = reply_email.subject - reply["Reply-To"] = f"{event}+{issue_thread}@{MAIL_DOMAIN}" + reply["Reply-To"] = f"{event}@{MAIL_DOMAIN}" if reply_email.in_reply_to: reply["In-Reply-To"] = reply_email.in_reply_to if reply_email.reference: @@ -207,7 +207,7 @@ Your c3lf (Cloakroom + Lost&Found) Team'''.format(active_issue_thread.short_uuid reply_email = Email.objects.create( sender=recipient, recipient=sender, body=body, subject=subject, in_reply_to=header_message_id, event=target_event, issue_thread=active_issue_thread) - reply = make_reply(reply_email, references) + reply = make_reply(reply_email, references, event=target_event.slug if target_event else None) else: # change state if not new if active_issue_thread.state != 'pending_new':