From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 10 Mar 2026 15:42:11 +0000 (+0000)
Subject: users: Treat all emails as auto-generated
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3e64b08cfebcf8d0e39acb6c9940fb70df46c76;p=dbl.git

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 98e79c4..e716f8f 100644
--- 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 d35352e..6895a2d 100644
--- 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