Browse Source

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

Update OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2624
1570-levenshtein-distance-user-search
Haelwenn 4 years ago
parent
commit
18b050dfd1
2 changed files with 2 additions and 4 deletions
  1. +1
    -3
      lib/pleroma/web/admin_api/controllers/status_controller.ex
  2. +1
    -1
      lib/pleroma/web/api_spec/operations/admin/status_operation.ex

+ 1
- 3
lib/pleroma/web/admin_api/controllers/status_controller.ex View File

@@ -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


+ 1
- 1
lib/pleroma/web/api_spec/operations/admin/status_operation.ex View File

@@ -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)
}
}


Loading…
Cancel
Save