SMTP: Adding contentType and contentType params to metadata output

programmfabrik · Jul 2, 2024 · 12fd66c · 12fd66c
1 parent deee3f5
commit 12fd66c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/internal/smtp/http.go b/internal/smtp/http.go
@@ -233,9 +233,18 @@ func (h *smtpHTTPHandler) handleMultipartMeta(
 }
 
 func buildContentMeta(c *ReceivedContent) map[string]any {
+	contentTypeParams := c.ContentTypeParams()
+	if contentTypeParams == nil {
+		// Returning an empty map instead of null more closely resembles the semantics
+		// of contentTypeParams.
+		contentTypeParams = make(map[string]string)
+	}
+
 	out := map[string]any{
-		"bodySize":    len(c.Body()),
-		"isMultipart": c.IsMultipart(),
+		"bodySize":          len(c.Body()),
+		"isMultipart":       c.IsMultipart(),
+		"contentType":       c.ContentType(),
+		"contentTypeParams": contentTypeParams,
 	}
 
 	headers := make(map[string]any)