aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/frontend.ex2
-rw-r--r--lib/pleroma/web/admin_api/controllers/frontend_controller.ex6
-rw-r--r--lib/pleroma/web/api_spec/operations/admin/frontend_operation.ex3
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/pleroma/frontend.ex b/lib/pleroma/frontend.ex
index b3d4c3325..bf935a728 100644
--- a/lib/pleroma/frontend.ex
+++ b/lib/pleroma/frontend.ex
@@ -42,9 +42,11 @@ defmodule Pleroma.Frontend do
else
{:download_or_unzip, _} ->
Logger.info("Could not download or unzip the frontend")
+ {:error, "Could not download or unzip the frontend"}
_e ->
Logger.info("Could not install the frontend")
+ {:error, "Could not install the frontend"}
end
end
diff --git a/lib/pleroma/web/admin_api/controllers/frontend_controller.ex b/lib/pleroma/web/admin_api/controllers/frontend_controller.ex
index 4518bed5a..fac3522b8 100644
--- a/lib/pleroma/web/admin_api/controllers/frontend_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/frontend_controller.ex
@@ -29,9 +29,9 @@ defmodule Pleroma.Web.AdminAPI.FrontendController do
end
def install(%{body_params: params} = conn, _params) do
- Pleroma.Frontend.install(params.name, Map.delete(params, :name))
-
- index(conn, %{})
+ with :ok <- Pleroma.Frontend.install(params.name, Map.delete(params, :name)) do
+ index(conn, %{})
+ end
end
defp installed do
diff --git a/lib/pleroma/web/api_spec/operations/admin/frontend_operation.ex b/lib/pleroma/web/api_spec/operations/admin/frontend_operation.ex
index 9d7d017a2..96d4cdee7 100644
--- a/lib/pleroma/web/api_spec/operations/admin/frontend_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/admin/frontend_operation.ex
@@ -36,7 +36,8 @@ defmodule Pleroma.Web.ApiSpec.Admin.FrontendOperation do
requestBody: request_body("Parameters", install_request(), required: true),
responses: %{
200 => Operation.response("Response", "application/json", list_of_frontends()),
- 403 => Operation.response("Forbidden", "application/json", ApiError)
+ 403 => Operation.response("Forbidden", "application/json", ApiError),
+ 400 => Operation.response("Error", "application/json", ApiError)
}
}
end