From: Michael Tremer Date: Fri, 14 Oct 2022 14:06:55 +0000 (+0000) Subject: mesages: Add To: header to all emails X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23f86aae1d98079764306875db056fc5262e44c5;p=pbs.git mesages: Add To: header to all emails Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/users.py b/src/buildservice/users.py index ac272b48..aababd2b 100644 --- a/src/buildservice/users.py +++ b/src/buildservice/users.py @@ -281,6 +281,13 @@ class User(base.DataObject): return user_email + @property + def email_to(self): + """ + The name/email address of the user in MIME format + """ + return email.utils.formataddr((self.name, self.email)) + def send_email(self, *args, **kwargs): return self.backend.messages.send_template( *args, diff --git a/src/templates/builds/messages/comment.txt b/src/templates/builds/messages/comment.txt index 2077027f..bedc65eb 100644 --- a/src/templates/builds/messages/comment.txt +++ b/src/templates/builds/messages/comment.txt @@ -1,3 +1,4 @@ +To: {{ recipient.email_to }} Subject: {{ _("%(user)s commented on %(build)s") % { "user" : comment.user, "build" : build }} {% for line in comment.text.splitlines() %} {{ line }}{% end %} diff --git a/src/templates/builds/messages/failed.txt b/src/templates/builds/messages/failed.txt index 5280e97b..9168c768 100644 --- a/src/templates/builds/messages/failed.txt +++ b/src/templates/builds/messages/failed.txt @@ -1,3 +1,4 @@ +To: {{ recipient.email_to }} Subject: [{{ build }}] {{ _("Build Failed") }} XXX TODO diff --git a/src/templates/builds/messages/finished.txt b/src/templates/builds/messages/finished.txt index b96fdba8..c92a612e 100644 --- a/src/templates/builds/messages/finished.txt +++ b/src/templates/builds/messages/finished.txt @@ -1,3 +1,4 @@ +To: {{ recipient.email_to }} Subject: [{{ build }}] {{ _("Build Finished") }} XXX TODO diff --git a/src/templates/jobs/messages/failed.txt b/src/templates/jobs/messages/failed.txt index 5757e3d6..42073dc4 100644 --- a/src/templates/jobs/messages/failed.txt +++ b/src/templates/jobs/messages/failed.txt @@ -1,3 +1,4 @@ +To: {{ recipient.email_to }} Subject: [{{ job.name }}] {{ _("Build Job Failed") }} {{ _("The build job %s has failed") % job.name }}.