Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix(email): stop trimming leading characters from email subjects

Matt Robertsf627409ba87f
diff --git a/app/services/email/email_test.go b/app/services/email/email_test.go
index 90223eec3..ccc30f43f 100644
--- a/app/services/email/email_test.go
+++ b/app/services/email/email_test.go
@@ -25,6 +25,15 @@ func TestRenderMessage_SubjectUnescapesHTMLEntities(t *testing.T) {
Expect(message.Subject).Equals(`Message to: Encontrar+se "quoted" & <tagged>`)
}
+func TestRenderMessage_SubjectKeepsLeadingCharacters(t *testing.T) {
+ RegisterT(t)
+
+ message := email.RenderMessage(context.Background(), "invite_email", email.NoReply, dto.Props{
+ "subject": "subscribe to our feedback site",
+ })
+ Expect(message.Subject).Equals("subscribe to our feedback site")
+}
+
func TestRenderMessage_EscapesPlainTextParams(t *testing.T) {
RegisterT(t)
diff --git a/app/services/email/message.go b/app/services/email/message.go
index a9ed834d3..ba82e2656 100644
--- a/app/services/email/message.go
+++ b/app/services/email/message.go
@@ -59,7 +59,7 @@ func RenderMessage(ctx context.Context, templateName string, fromAddress string,
// '"', '&', '<', '>' to numeric entities (e.g. "&#43;"). SMTP headers
// are plain text and clients do not decode HTML entities in them, so
// undo the escaping for the subject only.
- subject := html.UnescapeString(strings.TrimLeft(lines[0], "subject: "))
+ subject := html.UnescapeString(strings.TrimPrefix(lines[0], "subject: "))
return &Message{
Subject: subject,