diff --git a/lib/pleroma/web/api_spec/operations/mastodon_admin/account_operation.ex b/lib/pleroma/web/api_spec/operations/mastodon_admin/account_operation.ex index 1dab17a0d..23dae0306 100644 --- a/lib/pleroma/web/api_spec/operations/mastodon_admin/account_operation.ex +++ b/lib/pleroma/web/api_spec/operations/mastodon_admin/account_operation.ex @@ -221,7 +221,7 @@ defmodule Pleroma.Web.ApiSpec.MastodonAdmin.AccountOperation do def account do %Schema{ - title: "AdminAccount", + title: "Admin::Account", description: "Admin-level information about a given account.", type: :object, properties: %{ @@ -231,16 +231,27 @@ defmodule Pleroma.Web.ApiSpec.MastodonAdmin.AccountOperation do created_at: %Schema{type: :string, format: "date-time"}, email: %Schema{type: :string, format: "email", nullable: true}, ip: %Schema{type: :string, nullable: true}, - role: %Schema{type: :string, nullable: true}, - confirmed: %Schema{type: :boolean}, - sensitized: %Schema{type: :boolean, nullable: true}, - silenced: %Schema{type: :boolean, nullable: true}, - suspened: %Schema{type: :boolean, nullable: true}, - disabled: %Schema{type: :boolean}, - approved: %Schema{type: :boolean}, + ips: %Schema{ + type: :array, + items: %Schema{ + type: :object, + properties: %{ + ip: %Schema{type: :string}, + used_at: %Schema{type: :string, format: "date-time"} + } + } + }, locale: %Schema{type: :string, format: "date-time", nullable: true}, invite_request: %Schema{type: :string, format: "date-time", nullable: true}, - account: Account + role: %Schema{type: :string, nullable: true}, + confirmed: %Schema{type: :boolean}, + approved: %Schema{type: :boolean}, + disabled: %Schema{type: :boolean}, + silenced: %Schema{type: :boolean, nullable: true}, + suspended: %Schema{type: :boolean, nullable: true}, + account: Account, + created_by_application_id: %Schema{type: :string, nullable: true}, + invited_by_account_id: %Schema{type: :string, nullable: true} } } end diff --git a/lib/pleroma/web/mastodon_api/admin/views/account_view.ex b/lib/pleroma/web/mastodon_api/admin/views/account_view.ex index 7abc685c7..20ccfd51c 100644 --- a/lib/pleroma/web/mastodon_api/admin/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/admin/views/account_view.ex @@ -24,16 +24,15 @@ defmodule Pleroma.Web.MastodonAPI.Admin.AccountView do created_at: Utils.to_masto_date(user.inserted_at), email: user.email, ip: nil, - role: role(user), - confirmed: user.is_confirmed, - sensitized: nil, - suspened: nil, - silenced: nil, - disabled: !user.is_active, - approved: user.is_approved, + ips: [], locale: nil, invite_request: user.registration_reason, - ips: nil, + role: role(user), + confirmed: user.is_confirmed, + approved: user.is_approved, + disabled: !user.is_active, + silenced: nil, + suspended: nil, account: account } end