commit: 25a659d2dcd093939aa2cba049902ea54ab89312
parent: 00835bf6789fdba84979e7df1ac1864fde67a412
Author: kaniini <nenolod@gmail.com>
Date: Mon, 4 Feb 2019 16:52:41 +0000
Merge branch 'mime-riff' into 'develop'
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
Diffstat:
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/mime.ex b/lib/pleroma/mime.ex
@@ -102,10 +102,18 @@ defmodule Pleroma.MIME do
"audio/ogg"
end
- defp check_mime_type(<<0x52, 0x49, 0x46, 0x46, _::binary>>) do
+ defp check_mime_type(<<"RIFF", _::binary-size(4), "WAVE", _::binary>>) do
"audio/wav"
end
+ defp check_mime_type(<<"RIFF", _::binary-size(4), "WEBP", _::binary>>) do
+ "image/webp"
+ end
+
+ defp check_mime_type(<<"RIFF", _::binary-size(4), "AVI.", _::binary>>) do
+ "video/avi"
+ end
+
defp check_mime_type(_) do
@default
end