From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 26 Nov 2024 16:11:44 +0000 (+0000)
Subject: accounts: Simplify sending messages
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=377acc73847e6961faa70f5c82afdfe05f7367be;p=ipfire.org.git

accounts: Simplify sending messages

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

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 397f217c..8e1ec535 100644
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -793,8 +793,7 @@ class Account(LDAPObject):
 			VALUES(%s, %s, %s)", self.uid, reset_code, address)
 
 		# Send a password reset email
-		self.backend.messages.send_template("auth/messages/password-reset",
-			priority=100, account=self, reset_code=reset_code)
+		self.send_message("auth/messages/password-reset", priority=100, reset_code=reset_code)
 
 	def reset_password(self, reset_code, new_password):
 		# Delete the reset token
@@ -1415,6 +1414,14 @@ class Account(LDAPObject):
 		set_contents_to_promotional_emails,
 	)
 
+	# Messages
+
+	def send_message(self, *args, **kwargs):
+		"""
+			Sends an email
+		"""
+		return self.backend.messages.send_template(*args, account=self, **kwargs)
+
 	# Bugzilla
 
 	async def _disable_on_bugzilla(self, text=None):
diff --git a/src/backend/blog.py b/src/backend/blog.py
index 45621b9e..bde543e8 100644
--- a/src/backend/blog.py
+++ b/src/backend/blog.py
@@ -400,8 +400,7 @@ class Post(misc.Object):
 		with self.db.transaction():
 			# Generate an email for everybody in this group
 			for account in group:
-				self.backend.messages.send_template("blog/messages/announcement",
-					account=account, post=self)
+				account.send_message("blog/messages/announcement", post=self)
 
 			# Mark this post as announced
 			self.db.execute("UPDATE blog SET announced_at = CURRENT_TIMESTAMP \
diff --git a/src/backend/campaigns.py b/src/backend/campaigns.py
index ab305ff4..cf191b61 100644
--- a/src/backend/campaigns.py
+++ b/src/backend/campaigns.py
@@ -82,7 +82,7 @@ class CampaignEmail(Object):
 
 		# Generate the email
 		if self.should_be_sent:
-			self.backend.messages.send_template(self.template, account=self.account)
+			account.send_message(self.template)
 
 		# Update this email for the next launch
 		self._update()
diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index 56d15cfd..c90e1989 100644
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -596,8 +596,7 @@ class Page(misc.Object):
 			logging.debug("Sending watcher email to %s" % watcher)
 
 			# Compose message
-			self.backend.messages.send_template("wiki/messages/page-changed",
-				account=watcher, page=self, priority=-10)
+			watcher.send_message("wiki/messages/page-changed", page=self, priority=-10)
 
 	def restore(self, author, address, comment=None):
 		changes = "Restore to revision from %s" % self.timestamp.isoformat()