Signed-off-by: Max Schillinger <max@mxsr.de>
---
Forwarded patch. Originally sent to ~sircmpwn/public-inbox@lists.sr.ht
listssrht-lmtp | 34 +++++++++++++++++-----------------listssrht/process.py | 1 +
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/listssrht-lmtp b/listssrht-lmtp
index 30a171e..349b165 100755
--- a/listssrht-lmtp+++ b/listssrht-lmtp
@@ -33,62 +33,62 @@ posting_domain = cfg("lists.sr.ht", "posting-domain")
html_error = """Hi {}!
-We received your email, but were unable to deliver it because it-contains HTML. HTML emails are not permitted. The following guide can+We received your email, but were unable to deliver it because it +contains HTML. HTML emails are not permitted. The following guide can help you configure your client to send in plain text instead:
https://useplaintext.email
-If you have any questions, please reply to this email to reach the mail+If you have any questions, please reply to this email to reach the mail admin. We apologise for the inconvenience.
"""
forbidden_mimetype_error = """Hi {}!
-We received your email, but were unable to deliver it because it-contains content which has been blacklisted by the list admin. Please+We received your email, but were unable to deliver it because it +contains content which has been blacklisted by the list admin. Please remove your {} attachments and send again.
-You are also advised to configure your email client to send emails in+You are also advised to configure your email client to send emails in plain text to avoid additional errors in the future:
https://useplaintext.email
-If you have any questions, please reply to this email to reach the mail+If you have any questions, please reply to this email to reach the mail admin. We apologise for the inconvenience.
"""
text_plain_required_error = """Hi {}!
-We received your email, but were unable to deliver it because there were-no text/plain parts. Our mail system requires all emails to have at-least one plain text part. The following guide can help you configure+We received your email, but were unable to deliver it because there were +no text/plain parts. Our mail system requires all emails to have at +least one plain text part. The following guide can help you configure your client to send in plain text:
https://useplaintext.email
-If you have any questions, please reply to this email to reach the mail+If you have any questions, please reply to this email to reach the mail admin. We apologise for the inconvenience.
"""
unknown_mailing_list_error = """Hi {}!
-We received your email, but were unable to deliver it because the-mailing list you wrote to was not found. The correct posting addresses+We received your email, but were unable to deliver it because the +mailing list you wrote to was not found. The correct posting addresses are:
~username/list-name@{}
-Or if your mail system has trouble sending to addresses with ~ or / in+Or if your mail system has trouble sending to addresses with ~ or / in them, you can use:
u.username.list-name@{}
-If your mail system does not support our normal posting addresses, we-would appreciate it if you wrote to your mail admin to ask them to fix+If your mail system does not support our normal posting addresses, we +would appreciate it if you wrote to your mail admin to ask them to fix their system. Our posting addresses are valid per RFC-5322.
-If you have any questions, please reply to this email to reach the mail+If you have any questions, please reply to this email to reach the mail admin. We apologise for the inconvenience.
"""
diff --git a/listssrht/process.py b/listssrht/process.py
index 8fced13..6c4d61e 100644
--- a/listssrht/process.py+++ b/listssrht/process.py
@@ -623,6 +623,7 @@ def send_error_for(mail_b64, error):
reply["Date"] = formatdate()
reply["Message-ID"] = make_msgid()
reply["Auto-Submitted"] = "auto-replied"
+ reply["Content-Type"] = 'text/plain; charset="us-ascii"; format=flowed' print(reply.as_string())
smtp = start_smtp()
sender = parseaddr(mail["From"])
--
2.44.0
Thanks! Sorry for the long wait!
Pushed with a small fixup to avoid duplicate headers.
to git@git.sr.ht:~sircmpwn/lists.sr.ht
8b9a49f..efd47ef master -> master
Just because I had objections against previous version of this
patch, let me just say here, that I completely support this one,
and that all my objections were based on my misunderstanding of
the patch.
Matě