Merge pull request #4210 from Nachtalb/na/inline-audio-file-support

Improve inline audio file support
This commit is contained in:
Max Leiter 2021-05-11 17:05:28 -07:00 committed by GitHub
commit adf1b5abec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View File

@ -249,6 +249,8 @@ function parse(msg, chan, preview, res, client) {
case "audio/x-midi": case "audio/x-midi":
case "audio/x-mpeg": case "audio/x-mpeg":
case "audio/x-mpeg-3": case "audio/x-mpeg-3":
case "audio/flac":
case "audio/x-m4a":
if (!preview.link.startsWith("https://")) { if (!preview.link.startsWith("https://")) {
break; break;
} }

View File

@ -21,7 +21,8 @@ const inlineContentDispositionTypes = {
"audio/mpeg": "audio.mp3", "audio/mpeg": "audio.mp3",
"audio/ogg": "audio.ogg", "audio/ogg": "audio.ogg",
"audio/vnd.wave": "audio.wav", "audio/vnd.wave": "audio.wav",
"audio/flac": "audio.flac", "audio/x-flac": "audio.flac",
"audio/x-m4a": "audio.m4a",
"image/bmp": "image.bmp", "image/bmp": "image.bmp",
"image/gif": "image.gif", "image/gif": "image.gif",
"image/jpeg": "image.jpg", "image/jpeg": "image.jpg",
@ -110,10 +111,12 @@ class Uploader {
}); });
} }
if (detectedMimeType === "audio/vnd.wave") { // Send a more common mime type for audio files
// Send a more common mime type for wave audio files
// so that browsers can play them correctly // so that browsers can play them correctly
if (detectedMimeType === "audio/vnd.wave") {
detectedMimeType = "audio/wav"; detectedMimeType = "audio/wav";
} else if (detectedMimeType === "audio/x-flac") {
detectedMimeType = "audio/flac";
} }
res.setHeader("Content-Disposition", disposition); res.setHeader("Content-Disposition", disposition);