projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into docs/apache-config
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
account_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/account_view.ex
b/lib/pleroma/web/admin_api/views/account_view.ex
index 333e72e42ab083743378d14b969dfa5fee810183..d7c63d385d803b52af1bd6c2f676d4302922acaf 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/account_view.ex
+++ b/
lib/pleroma/web/admin_api/views/account_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.AccountView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.AccountView do
@@
-39,7
+39,7
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
:fields,
:name,
:nickname,
:fields,
:name,
:nickname,
- :locked,
+ :
is_
locked,
:no_rich_text,
:default_scope,
:hide_follows,
:no_rich_text,
:default_scope,
:hide_follows,
@@
-52,7
+52,7
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
:skip_thread_containment,
:pleroma_settings_store,
:raw_fields,
:skip_thread_containment,
:pleroma_settings_store,
:raw_fields,
- :discoverable,
+ :
is_
discoverable,
:actor_type
])
|> Map.merge(%{
:actor_type
])
|> Map.merge(%{
@@
-69,17
+69,19
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
%{
"id" => user.id,
%{
"id" => user.id,
+ "email" => user.email,
"avatar" => avatar,
"nickname" => user.nickname,
"display_name" => display_name,
"avatar" => avatar,
"nickname" => user.nickname,
"display_name" => display_name,
- "
deactivated" => user.deactivated
,
+ "
is_active" => user.is_active
,
"local" => user.local,
"roles" => User.roles(user),
"tags" => user.tags || [],
"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,
"url" => user.uri || user.ap_id,
- "registration_reason" => user.registration_reason
+ "registration_reason" => user.registration_reason,
+ "actor_type" => user.actor_type
}
end
}
end