diff options
| author | Mark Felder <feld@feld.me> | 2021-01-18 14:58:21 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-18 14:58:21 -0600 |
| commit | 28581e03ad5761aa484a7fa427be8ab5695f0892 (patch) | |
| tree | 3296b3906ab31c6cebfa5fdc704fad83bf3bbee6 /lib/pleroma/web/admin_api | |
| parent | 6c50ac1d3fb81e3fd7f0af90bab667e5e18193d6 (diff) | |
| parent | ed84210da3eeee8e448a3a609f7c4da90d798038 (diff) | |
| download | pleroma-28581e03ad5761aa484a7fa427be8ab5695f0892.tar.gz | |
Merge branch 'develop' into refactor/deactivated_user_field
Diffstat (limited to 'lib/pleroma/web/admin_api')
| -rw-r--r-- | lib/pleroma/web/admin_api/views/account_view.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex index c4be096a9..d7c63d385 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -77,8 +77,8 @@ defmodule Pleroma.Web.AdminAPI.AccountView do "local" => user.local, "roles" => User.roles(user), "tags" => user.tags || [], - "confirmation_pending" => user.confirmation_pending, - "approval_pending" => user.approval_pending, + "is_confirmed" => user.is_confirmed, + "is_approved" => user.is_approved, "url" => user.uri || user.ap_id, "registration_reason" => user.registration_reason, "actor_type" => user.actor_type |