users: Treat all emails as auto-generated

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/dbl/reports.py b/src/dbl/reports.py
index 98e79c487b0d13524ecad5d81428b575726c2794..e716f8f321f5b7eeb7725e5220956216066f6abf 100644 (file)
--- a/src/dbl/reports.py
+++ b/src/dbl/reports.py
@@ -244,11 +244,6 @@ class Reports(object):
                        # Send the message
                        moderator.sendmail("\n".join(lines), headers={
                                "Subject" : _("[IPFire DBL] Pending Reports"),
-
-                               # Mark that this email is auto-generated
-                               "Auto-Submitted"           : "auto-generated",
-                               "X-Auto-Response-Suppress" : "OOF, AutoReply",
-                               "Precedence"               : "bulk",
                        })
 
 
@@ -445,6 +440,11 @@ class Report(sqlmodel.SQLModel, database.BackendMixin, table=True):
                # Send the email
                reporter.sendmail("\n".join(lines), headers={
                        "Subject" : _("[IPFire DBL] Your DBL Report For %s Has Been Received") % name,
+
+                       # Mark that this email is auto-generated
+                       "Auto-Submitted"           : "auto-generated",
+                       "X-Auto-Response-Suppress" : "OOF, AutoReply",
+                       "Precedence"               : "bulk",
                })
 
        async def _send_closing_notification(self):

diff --git a/src/dbl/users.py b/src/dbl/users.py
index d35352ec52cc42f1a8db389b09885fc69bb4c653..6895a2de2d2291c14134efd555f74ca1a2c5ff93 100644 (file)
--- a/src/dbl/users.py
+++ b/src/dbl/users.py
@@ -204,7 +204,7 @@ class User(LDAPObject):
                """
                return self in self.backend.users.trusted_reporters
 
-       def sendmail(self, message, sender=None, headers=None):
+       def sendmail(self, message, sender=None, headers=None, autogenerated=True):
                """
                        Sends the given message to this user
                """
@@ -233,6 +233,12 @@ class User(LDAPObject):
                        for header in headers:
                                message[header] = headers[header]
 
+               # Mark that this email is auto-generated
+               if autogenerated:
+                       message["Auto-Submitted"] = "auto-generated"
+                       message["X-Auto-Response-Suppress"] = "OOF, AutoReply"
+                       message["Precedence"] = "bulk"
+
                # Set a sender if none set
                if not "From" in message:
                        message["From"] = no_reply