mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-29 15:56:16 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] Advertise audio/mpeg as supported

Browse source 
This will be either an mp1, mp2 or mp3 file. In practice it'll probably
be mp3, but this handles mp1 too for good measure. We don't advertise
audio/mp1 as a supported media type since best I can tell that was never
a MIME type that's been used.

This also changes the returned MIME-type for mp2 and mp3 to audio/mpeg,
to match what's expected and supported by most things nowadays.

Fixes: #3531
This commit is contained in:
Daenney 2024-12-27 18:30:24 +01:00
commit be8b25f8fd
4 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/api/client/instance/instancepatch_test.go
View file

@ -113,6 +113,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch1() {
"image/webp",
"audio/mp2",
"audio/mp3",
"audio/mpeg",
"video/x-msvideo",
"audio/flac",
"audio/x-flac",
@ -254,6 +255,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch2() {
"image/webp",
"audio/mp2",
"audio/mp3",
"audio/mpeg",
"video/x-msvideo",
"audio/flac",
"audio/x-flac",
@ -395,6 +397,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch3() {
"image/webp",
"audio/mp2",
"audio/mp3",
"audio/mpeg",
"video/x-msvideo",
"audio/flac",
"audio/x-flac",
@ -587,6 +590,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch6() {
"image/webp",
"audio/mp2",
"audio/mp3",
"audio/mpeg",
"video/x-msvideo",
"audio/flac",
"audio/x-flac",
@ -750,6 +754,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch8() {
"image/webp",
"audio/mp2",
"audio/mp3",
"audio/mpeg",
"video/x-msvideo",
"audio/flac",
"audio/x-flac",
@ -932,6 +937,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch9() {
"image/webp",
"audio/mp2",
"audio/mp3",
"audio/mpeg",
"video/x-msvideo",
"audio/flac",
"audio/x-flac",

7
internal/media/ffmpeg.go
View file

@ -377,12 +377,15 @@ func (res *result) GetFileType() (gtsmodel.FileType, string, string) {
case "mp3":
if len(res.audio) > 0 {
switch res.audio[0].codec {
case "mp1":
return gtsmodel.FileTypeAudio,
"audio/mpeg", "mp1"
case "mp2":
return gtsmodel.FileTypeAudio,
"audio/mp2", "mp2"
"audio/mpeg", "mp2"
case "mp3":
return gtsmodel.FileTypeAudio,
"audio/mp3", "mp3"
"audio/mpeg", "mp3"
}
}
case "asf":

5
internal/media/manager.go
View file

@ -39,8 +39,9 @@ var SupportedMIMETypes = []string{
"image/gif", // .gif
"image/webp", // .webp
"audio/mp2", // .mp2
"audio/mp3", // .mp3
"audio/mp2", // .mp2
"audio/mp3", // .mp3
"audio/mpeg", // .mp1, .mp2, .mp3
"video/x-msvideo", // .avi

2
internal/typeutils/internaltofrontend_test.go
View file

@ -1960,6 +1960,7 @@ func (suite *InternalToFrontendTestSuite) TestInstanceV1ToFrontend() {
"image/webp",
"audio/mp2",
"audio/mp3",
"audio/mpeg",
"video/x-msvideo",
"audio/flac",
"audio/x-flac",
@ -2105,6 +2106,7 @@ func (suite *InternalToFrontendTestSuite) TestInstanceV2ToFrontend() {
"image/webp",
"audio/mp2",
"audio/mp3",
"audio/mpeg",
"video/x-msvideo",
"audio/flac",
"audio/x-flac",