c3lf/c3lf-system-3
7
0
Fork 0
Code Issues 52 Pull requests Projects 2 Releases Wiki Activity Actions

quickfix for "Reply-To is noreply+None@domain.tld"

Browse source
This commit is contained in:
j3d1 2024-01-13 03:31:17 +01:00
parent 9269f2ec48
commit d6df034ad0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/mail/protocol.py
View file

@ -52,15 +52,15 @@ def collect_references(issue_thread):
return references 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 email.message import EmailMessage
from core.settings import MAIL_DOMAIN from core.settings import MAIL_DOMAIN
event = event or "noreply" event = event or "mail"
reply = EmailMessage() reply = EmailMessage()
reply["From"] = reply_email.sender reply["From"] = reply_email.sender
reply["To"] = reply_email.recipient reply["To"] = reply_email.recipient
reply["Subject"] = reply_email.subject 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: if reply_email.in_reply_to:
reply["In-Reply-To"] = reply_email.in_reply_to reply["In-Reply-To"] = reply_email.in_reply_to
if reply_email.reference: 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( reply_email = Email.objects.create(
sender=recipient, recipient=sender, body=body, subject=subject, sender=recipient, recipient=sender, body=body, subject=subject,
in_reply_to=header_message_id, event=target_event, issue_thread=active_issue_thread) 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: else:
# change state if not new # change state if not new
if active_issue_thread.state != 'pending_new': if active_issue_thread.state != 'pending_new':