X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fupload%2Ffilter%2Fmogrifun.ex;h=363e5cf0f2881d31dab31d91a91a96983f5cc87d;hb=7490b76bbfa0e39f7950d5611f00bddb2aac34ad;hp=8f362333d3867617faa82efd320b52f03c0d49a8;hpb=3116a75e80144dff79232c8676bd28ed285a14d9;p=akkoma

diff --git a/lib/pleroma/upload/filter/mogrifun.ex b/lib/pleroma/upload/filter/mogrifun.ex
index 8f362333d..363e5cf0f 100644
--- a/lib/pleroma/upload/filter/mogrifun.ex
+++ b/lib/pleroma/upload/filter/mogrifun.ex
@@ -6,6 +6,10 @@ defmodule Pleroma.Upload.Filter.Mogrifun do
   @behaviour Pleroma.Upload.Filter
   alias Pleroma.Upload.Filter
 
+  @moduledoc """
+  This module is just an example of an Upload filter. It's not supposed to be used in production.
+  """
+
   @filters [
     {"implode", "1"},
     {"-raise", "20"},
@@ -34,14 +38,16 @@ defmodule Pleroma.Upload.Filter.Mogrifun do
     [{"fill", "yellow"}, {"tint", "40"}]
   ]
 
+  @spec filter(Pleroma.Upload.t()) :: {:ok, atom()} | {:error, String.t()}
   def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
-    if Pleroma.Utils.command_available?("mogrify") do
+    try do
       Filter.Mogrify.do_filter(file, [Enum.random(@filters)])
-      :ok
-    else
-      {:error, "mogrify command not found"}
+      {:ok, :filtered}
+    rescue
+      _e in ErlangError ->
+        {:error, "mogrify command not found"}
     end
   end
 
-  def filter(_), do: :ok
+  def filter(_), do: {:ok, :noop}
 end