From 89f70a3aa59c526fa2e947779054e0e291efc8bd Mon Sep 17 00:00:00 2001 From: Amy Gale Ruth Bowersox Date: Thu, 5 Mar 2026 23:13:36 -0700 Subject: [PATCH] E-mails should include the X-Mailer header --- email/sender.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/email/sender.go b/email/sender.go index f11f31b..b565773 100644 --- a/email/sender.go +++ b/email/sender.go @@ -19,6 +19,7 @@ import ( "maps" "net/smtp" "os" + "runtime" "slices" "strings" @@ -81,8 +82,9 @@ func formatMessage(ctx context.Context, m *amMessage) ([]byte, error) { } hdrs["Subject"] = m.subject hdrs["Content-Type"] = "text/plain; charset=UTF-8" + hdrs["X-Mailer"] = fmt.Sprintf("Amsterdam AutoMail System %s", config.AMSTERDAM_VERSION) me, _ := os.Hostname() - hdrs["X-Amsterdam-Server-Info"] = fmt.Sprintf("%s (Amsterdam/%s)", me, config.AMSTERDAM_VERSION) + hdrs["X-Amsterdam-Server-Info"] = fmt.Sprintf("%s (Amsterdam/%s %s)", me, config.AMSTERDAM_VERSION, runtime.Version()) hdrs["X-Amsterdam-Sender-Info"] = fmt.Sprintf("uid %d, name %s, ip [%s]", m.uid, user.Username, m.ip) for i, v := range disclaimerLines { hdrs[fmt.Sprintf("X-Disclaimer-%d", i+1)] = v