From ba14044cfeb974f12417d6f534aa622f4a3890f3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 16 Jan 2020 09:40:22 +0000 Subject: [PATCH] messages: Make sure all messages have a To: header Signed-off-by: Michael Tremer --- src/backend/accounts.py | 2 +- src/backend/wiki.py | 2 +- src/templates/auth/messages/password-reset.txt | 2 +- src/templates/people/messages/new-account.txt | 1 + src/templates/wiki/messages/page-changed.txt | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backend/accounts.py b/src/backend/accounts.py index 451d0a1a..8eababbd 100644 --- a/src/backend/accounts.py +++ b/src/backend/accounts.py @@ -481,7 +481,7 @@ class Accounts(Object): # Send email about account registration self.backend.messages.send_template("people/messages/new-account", - recipients=["moderators@ipfire.org"], account=account) + account=account) # Launch drip campaigns for campaign in ("signup", "christmas"): diff --git a/src/backend/wiki.py b/src/backend/wiki.py index 7d1d0cba..02bb24ff 100644 --- a/src/backend/wiki.py +++ b/src/backend/wiki.py @@ -445,7 +445,7 @@ class Page(misc.Object): # Compose message self.backend.messages.send_template("wiki/messages/page-changed", - recipients=[watcher], page=self, priority=-10) + account=watcher, page=self, priority=-10) def restore(self, author, address): changes = "Restore to revision from %s" % self.timestamp.isoformat() diff --git a/src/templates/auth/messages/password-reset.txt b/src/templates/auth/messages/password-reset.txt index 52888d82..c6f81bc8 100644 --- a/src/templates/auth/messages/password-reset.txt +++ b/src/templates/auth/messages/password-reset.txt @@ -1,5 +1,5 @@ From: IPFire Project -To: {{ account }} <{{ account.email }}> +To: {{ account.email_to }} Subject: {{ _("Please Reset Your Password") }} X-Auto-Response-Suppress: OOF diff --git a/src/templates/people/messages/new-account.txt b/src/templates/people/messages/new-account.txt index fe7973f3..9b9daacd 100644 --- a/src/templates/people/messages/new-account.txt +++ b/src/templates/people/messages/new-account.txt @@ -1,4 +1,5 @@ From: IPFire Project +To: IPFire Moderators Subject: {{ _("New Account Registered: %s") % account }} {{ _("Hello,") }} diff --git a/src/templates/wiki/messages/page-changed.txt b/src/templates/wiki/messages/page-changed.txt index 77c86e8c..42058980 100644 --- a/src/templates/wiki/messages/page-changed.txt +++ b/src/templates/wiki/messages/page-changed.txt @@ -1,4 +1,5 @@ From: IPFire Project +To: {{ account.email_to }} Subject: [{{ _("IPFire Wiki") }}] {{ _("Page Changed: %s") % page.title }} Hey, -- 2.47.3