From d28d3e21ee0cc23685a5604b8e3e43efba618945 Mon Sep 17 00:00:00 2001 From: Gonne Date: Mon, 26 Sep 2022 14:17:25 +0200 Subject: [PATCH] =?UTF-8?q?F=C3=BCge=20Message-Id=20zur=20Mail=20hinzu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repositories/request.go | 8 +++++--- templating/templates/confirmationMail | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/repositories/request.go b/repositories/request.go index e6273e9..e4ec7ed 100644 --- a/repositories/request.go +++ b/repositories/request.go @@ -7,6 +7,7 @@ import ( "database/sql" "errors" "fmt" + "html/template" "log" "math/big" "net/smtp" @@ -128,9 +129,10 @@ func (r *RequestRepo) newSecret() (string, error) { func (r *RequestRepo) sendConfirmationMail(request models.Request) error { var message bytes.Buffer var data = struct { - Config config.Config - Request models.Request - }{r.config, request} + Config config.Config + Request models.Request + MessageId template.HTML + }{r.config, request, template.HTML("<" + randomString(15) + "@" + r.config.Server.Domain + ">")} err := templating.WriteTemplate(&message, "confirmationMail", data) if err != nil { err = fmt.Errorf("Error parsing confirmation Mail: %w", err) diff --git a/templating/templates/confirmationMail b/templating/templates/confirmationMail index 6a14e50..759fce4 100644 --- a/templating/templates/confirmationMail +++ b/templating/templates/confirmationMail @@ -1,6 +1,7 @@ From: {{.Config.Mailer.FromName}} To: {{.Request.OfficeHour.Tutor.Email}} Subject: Sprechstunde {{if eq .Request.Action 1}}anlegen{{end}}{{if eq .Request.Action 2}}löschen{{end}} +Message-Id: {{.MessageId}} Hallo {{.Request.OfficeHour.Tutor.Name}},