Skip to content

armgit / posta

Public Imported from GitHub
0

Self-hosted email delivery platform that enables applications to send emails via HTTP APIs while handling SMTP delivery, templates, storage, security, and analytics. Fully self-hostable alternative to services like SendGrid or Mailgun.

fix(handlers): share an email field constant, preallocate a test slice

Jonas Kaninda15ae6dbdc77d
diff --git a/internal/handlers/form_page_handler.go b/internal/handlers/form_page_handler.go
index 3695a8f..f1156c1 100644
--- a/internal/handlers/form_page_handler.go
+++ b/internal/handlers/form_page_handler.go
@@ -35,9 +35,13 @@ import (
const maxPrefillLength = 2000
+// fieldEmail is the key of an email field: the widget's built-in field and
+// the email column of a subscriber import.
+const fieldEmail = "email"
+
// builtinPrefillKeys are the fields the widget shows for a form without a
// schema, so its share link can prefill them too.
-var builtinPrefillKeys = []string{"name", "email", "phone", "subject", "message"}
+var builtinPrefillKeys = []string{"name", fieldEmail, "phone", "subject", "message"}
// hostedPageCSP keeps a hosted page to Posta's own script and API. Inline
// styles are allowed for the page and the widget's shadow root; images may
diff --git a/internal/handlers/form_page_test.go b/internal/handlers/form_page_test.go
index 4d5a20a..00e34ba 100644
--- a/internal/handlers/form_page_test.go
+++ b/internal/handlers/form_page_test.go
@@ -44,8 +44,9 @@ func TestPrefillAttrs(t *testing.T) {
"unknown": {"x"},
"note": {strings.Repeat("x", maxPrefillLength+1)},
}
- var got []string
- for _, a := range prefillAttrs(form, query) {
+ attrs := prefillAttrs(form, query)
+ got := make([]string, 0, len(attrs))
+ for _, a := range attrs {
got = append(got, string(a))
}
want := []string{`data-value-plan="pro"`, `data-value-topics="["a, b","c"]"`}
diff --git a/internal/handlers/subscriber_handler.go b/internal/handlers/subscriber_handler.go
index 791b300..6725cca 100644
--- a/internal/handlers/subscriber_handler.go
+++ b/internal/handlers/subscriber_handler.go
@@ -279,7 +279,7 @@ func (h *SubscriberHandler) BulkImportCSV(c *okapi.Context) error {
// Parse optional column mapping: {"0":"email","1":"name","2":"custom_fields.company"}
mappingStr := c.Request().FormValue("column_mapping")
- columnMap := map[int]string{0: "email", 1: "name"} // defaults
+ columnMap := map[int]string{0: fieldEmail, 1: "name"} // defaults
if mappingStr != "" {
var raw map[string]string
if err := json.Unmarshal([]byte(mappingStr), &raw); err == nil {
@@ -328,7 +328,7 @@ func (h *SubscriberHandler) BulkImportCSV(c *okapi.Context) error {
}
val := strings.TrimSpace(record[idx])
switch field {
- case "email":
+ case fieldEmail:
s.Email = strings.ToLower(val)
case "name":
s.Name = val