squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert these for now

Browse Source
This commit is contained in:
Mark Felder 2021-02-20 14:25:11 -06:00
parent b23cf2d149
commit 4adb9e8e2c
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/upload/filter/exiftool.ex
View File

@ -11,8 +11,7 @@ defmodule Pleroma.Upload.Filter.Exiftool do
@spec filter(Pleroma.Upload.t()) :: {:ok, any()} | {:error, String.t()}
# not compatible with exiftool at this time
def filter(%Pleroma.Upload{content_type: "image/heic"}), do: {:ok, :noop}
# webp is not compatible with exiftool at this time
def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do

4
lib/pleroma/upload/filter/mogrifun.ex
View File

@ -44,8 +44,8 @@ defmodule Pleroma.Upload.Filter.Mogrifun do
Filter.Mogrify.do_filter(file, [Enum.random(@filters)])
{:ok, :filtered}
rescue
e in ErlangError ->
{:error, "#{__MODULE__}: #{inspect(e)}"}
_e in ErlangError ->
{:error, "mogrify command not found"}
end
end

4
lib/pleroma/upload/filter/mogrify.ex
View File

@ -14,8 +14,8 @@ defmodule Pleroma.Upload.Filter.Mogrify do
do_filter(file, Pleroma.Config.get!([__MODULE__, :args]))
{:ok, :filtered}
rescue
e in ErlangError ->
{:error, "#{__MODULE__}: #{inspect(e)}"}
_e in ErlangError ->
{:error, "mogrify command not found"}
end
end