bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

error rename

This commit is contained in:
Alexander Strizhakov 2020-03-30 09:09:27 +03:00
parent 9855018425
commit 36abeedf9f
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/emoji/pack.ex
View File

@ -188,7 +188,7 @@ def import_from_filesystem do
{:ok, names} {:ok, names}
else else
{:ok, %{access: _}} -> {:error, :not_writable} {:ok, %{access: _}} -> {:error, :no_read_write}
e -> e e -> e
end end
end end

2
lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex
View File

@ -287,7 +287,7 @@ def import_from_filesystem(conn, _params) do
with {:ok, names} <- Pack.import_from_filesystem() do with {:ok, names} <- Pack.import_from_filesystem() do
json(conn, names) json(conn, names)
else else
{:error, :not_writable} -> {:error, :no_read_write} ->
conn conn
|> put_status(:internal_server_error) |> put_status(:internal_server_error)
|> json(%{error: "Error: emoji pack directory must be writable"}) |> json(%{error: "Error: emoji pack directory must be writable"})