pleroma

commit: 18b050dfd1fe053d28440c889feafb88dd6a9a73
parent: d28d88766bc0ec98e391eed0402e35280c384c8c
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Wed,  3 Jun 2020 14:04:12 +0000

Merge branch 'openapi/update-admin-api/status' into 'develop'

Update OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2624
Diffstat:
M
lib/pleroma/web/admin_api/controllers/status_controller.ex
4
+---
M
lib/pleroma/web/api_spec/operations/admin/status_operation.ex
2
+-

2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/pleroma/web/admin_api/controllers/status_controller.ex b/lib/pleroma/web/admin_api/controllers/status_controller.ex
@@ -41,9 +41,7 @@ defmodule Pleroma.Web.AdminAPI.StatusController do
 
   def show(conn, %{id: id}) do
     with %Activity{} = activity <- Activity.get_by_id(id) do
-      conn
-      |> put_view(Pleroma.Web.AdminAPI.StatusView)
-      |> render("show.json", %{activity: activity})
+      render(conn, "show.json", %{activity: activity})
     else
       nil -> {:error, :not_found}
     end
diff --git a/lib/pleroma/web/api_spec/operations/admin/status_operation.ex b/lib/pleroma/web/api_spec/operations/admin/status_operation.ex
@@ -74,7 +74,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.StatusOperation do
       parameters: [id_param()],
       security: [%{"oAuth" => ["read:statuses"]}],
       responses: %{
-        200 => Operation.response("Status", "application/json", Status),
+        200 => Operation.response("Status", "application/json", status()),
         404 => Operation.response("Not Found", "application/json", ApiError)
       }
     }