Fix media URL extension for m4a uploads

server/media/s3/s3.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
-	"mime"
 	"net/http"
 	"net/url"
 	"path"
@@ -280,22 +279,23 @@ func (ah *awshandler) Upload(fdef *types.FileDef, file io.Reader) (string, int64
 	}
 
 	rc := readerCounter{reader: file}
-	result, err := tmClient.UploadObject(context.Background(), &transfermanager.UploadObjectInput{
+	input := &transfermanager.UploadObjectInput{
 		CacheControl: aws.String(ah.conf.CacheControl),
 		Bucket:       aws.String(ah.conf.BucketName),
 		Key:          aws.String(key),
 		Body:         &rc,
-	})
+	}
+	if fdef.MimeType != "" {
+		input.ContentType = aws.String(fdef.MimeType)
+	}
+	result, err := tmClient.UploadObject(context.Background(), input)
 
 	if err != nil {
 		return "", 0, err
 	}
 
 	fname := fdef.Id
-	ext, _ := mime.ExtensionsByType(fdef.MimeType)
-	if len(ext) > 0 {
-		fname += ext[0]
-	}
+	fname += media.ExtensionByMimeType(fdef.MimeType)
 
 	fdef.Location = key
 	if result.ETag != nil {