projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
fallback_controller.ex
diff --git
a/lib/pleroma/web/admin_api/controllers/fallback_controller.ex
b/lib/pleroma/web/admin_api/controllers/fallback_controller.ex
index 9f7bb92ce74bfb402627ceddc56647e310507d62..34d90db076598bd35d2208876692f860817e02fd 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/fallback_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/fallback_controller.ex
@@
-8,13
+8,19
@@
defmodule Pleroma.Web.AdminAPI.FallbackController do
def call(conn, {:error, :not_found}) do
conn
|> put_status(:not_found)
def call(conn, {:error, :not_found}) do
conn
|> put_status(:not_found)
- |> json(
dgettext("errors", "Not found")
)
+ |> json(
%{error: dgettext("errors", "Not found")}
)
end
def call(conn, {:error, reason}) do
conn
|> put_status(:bad_request)
end
def call(conn, {:error, reason}) do
conn
|> put_status(:bad_request)
- |> json(reason)
+ |> json(%{error: reason})
+ end
+
+ def call(conn, {:errors, errors}) do
+ conn
+ |> put_status(:bad_request)
+ |> json(%{errors: errors})
end
def call(conn, {:param_cast, _}) do
end
def call(conn, {:param_cast, _}) do
@@
-26,6
+32,6
@@
defmodule Pleroma.Web.AdminAPI.FallbackController do
def call(conn, _) do
conn
|> put_status(:internal_server_error)
def call(conn, _) do
conn
|> put_status(:internal_server_error)
- |> json(
dgettext("errors", "Something went wrong")
)
+ |> json(
%{error: dgettext("errors", "Something went wrong")}
)
end
end
end
end