diff options
author | kaniini <nenolod@gmail.com> | 2019-02-04 16:52:41 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-02-04 16:52:41 +0000 |
commit | 25a659d2dcd093939aa2cba049902ea54ab89312 (patch) | |
tree | fd6681d6eb9f7962c7cf5816254710e19cff9619 /lib | |
parent | 00835bf6789fdba84979e7df1ac1864fde67a412 (diff) | |
parent | 127f99ae18eea7732e8cb7756a102ca4c5beacca (diff) | |
download | pleroma-25a659d2dcd093939aa2cba049902ea54ab89312.tar.gz |
Merge branch 'mime-riff' into 'develop'
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/mime.ex | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/pleroma/mime.ex b/lib/pleroma/mime.ex index 84fb536e0..36771533f 100644 --- 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 |