Prioritize the content-type header for attachments response for mimetype detection

norkans7 · norkans7 · commit d774bddd46b3 · 2024-04-26T15:57:11.000+02:00
diff --git a/attachments.go b/attachments.go
@@ -127,9 +127,10 @@ func FetchAndStoreAttachment(ctx context.Context, b Backend, channel Channel, at
 		}
 	}
 
-	// we still don't know our mime type, use our content header instead
-	if mimeType == "" {
-		mimeType, _, _ = mime.ParseMediaType(trace.Response.Header.Get("Content-Type"))
+	// prioritize to use the response content type header if provided
+	contentTypeHeader := trace.Response.Header.Get("Content-Type")
+	if contentTypeHeader != "" {
+		mimeType, _, _ = mime.ParseMediaType(contentTypeHeader)
 		if extension == "" {
 			extensions, err := mime.ExtensionsByType(mimeType)
 			if extensions == nil || err != nil {

Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,10 @@ func FetchAndStoreAttachment(ctx context.Context, b Backend, channel Channel, at`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`130`		`- // we still don't know our mime type, use our content header instead`
`131`		`- if mimeType == "" {`
`132`		`- mimeType, _, _ = mime.ParseMediaType(trace.Response.Header.Get("Content-Type"))`
	`130`	`+ // prioritize to use the response content type header if provided`
	`131`	`+ contentTypeHeader := trace.Response.Header.Get("Content-Type")`
	`132`	`+ if contentTypeHeader != "" {`
	`133`	`+ mimeType, _, _ = mime.ParseMediaType(contentTypeHeader)`
`133`	`134`	`if extension == "" {`
`134`	`135`	`extensions, err := mime.ExtensionsByType(mimeType)`
`135`	`136`	`if extensions == nil \|\| err != nil {`