bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mastodon-admin-api' into 'develop'

Browse source 
MastodonAPI.Admin.AccountView: show registration reason

See merge request soapbox-pub/soapbox-be!129
This commit is contained in:
marcin mikołajczak 2022-05-15 21:12:28 +00:00
commit 90b31ccfe4
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/pleroma/web/api_spec/operations/mastodon_admin/report_operation.ex
View file

@ -39,7 +39,7 @@ def index_operation do
pagination_params(),
responses: %{
200 =>
Operation.response("Account", "application/json", %Schema{
Operation.response("Report", "application/json", %Schema{
title: "ArrayOfReports",
type: :array,
items: report()
@ -60,7 +60,7 @@ def show_operation do
Operation.parameter(:id, :path, :string, "ID of the report")
],
responses: %{
200 => Operation.response("Account", "application/json", report()),
200 => Operation.response("Report", "application/json", report()),
401 => Operation.response("Error", "application/json", ApiError),
404 => Operation.response("Error", "application/json", ApiError)
}
@ -78,7 +78,7 @@ def resolve_operation do
Operation.parameter(:id, :path, :string, "ID of the report")
],
responses: %{
200 => Operation.response("Account", "application/json", report()),
200 => Operation.response("Report", "application/json", report()),
400 => Operation.response("Error", "application/json", ApiError),
401 => Operation.response("Error", "application/json", ApiError)
}
@ -96,7 +96,7 @@ def reopen_operation do
Operation.parameter(:id, :path, :string, "ID of the report")
],
responses: %{
200 => Operation.response("Account", "application/json", report()),
200 => Operation.response("Report", "application/json", report()),
400 => Operation.response("Error", "application/json", ApiError),
401 => Operation.response("Error", "application/json", ApiError)
}
@ -114,7 +114,7 @@ def assign_to_self_operation do
Operation.parameter(:id, :path, :string, "ID of the report")
],
responses: %{
200 => Operation.response("Account", "application/json", report()),
200 => Operation.response("Report", "application/json", report()),
400 => Operation.response("Error", "application/json", ApiError),
401 => Operation.response("Error", "application/json", ApiError)
}
@ -132,7 +132,7 @@ def unassign_operation do
Operation.parameter(:id, :path, :string, "ID of the report")
],
responses: %{
200 => Operation.response("Account", "application/json", report()),
200 => Operation.response("Report", "application/json", report()),
400 => Operation.response("Error", "application/json", ApiError),
401 => Operation.response("Error", "application/json", ApiError)
}

2
lib/pleroma/web/mastodon_api/admin/views/account_view.ex
View file

@ -32,7 +32,7 @@ def render("show.json", %{user: user}) do
disabled: !user.is_active,
approved: user.is_approved,
locale: nil,
invite_request: nil,
invite_request: user.registration_reason,
ips: nil,
account: account
}