Merge branch 'stable' into release/2.0.0

[akkoma] / lib / pleroma / web / pleroma_api / controllers / emoji_api_controller.ex

diff --git a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
index 42f62d97a1ee3d511148a32434cd1790e00e8210..03e95e0202fa7454705c24f2a3ec6c4ae7ec91cd 100644 (file)
--- a/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
@@ -323,7 +323,7 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
       {:ok, _} ->
         conn |> json("ok")
 
-      {:error, _} ->
+      {:error, _, _} ->
         conn
         |> put_status(:internal_server_error)
         |> json(%{error: "Couldn't delete the pack #{name}"})
@@ -591,7 +591,7 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
       {:ok, %{access: _}} ->
         conn
         |> put_status(:internal_server_error)
-        |> json(%{error: "Error emoji pack directory must be writable and readable"})
+        |> json(%{error: "Error: emoji pack directory must be writable"})
 
       {:error, _} ->
         conn