projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[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 78062e5202d3efb0dd476e0a65e8beb34b909644..37188bfeb27ef64d8a99c5a1305ffc0268035f18 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,6
+69,7
@@
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,
@@
-77,8
+78,10
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
"roles" => User.roles(user),
"tags" => user.tags || [],
"confirmation_pending" => user.confirmation_pending,
"roles" => User.roles(user),
"tags" => user.tags || [],
"confirmation_pending" => user.confirmation_pending,
+ "approval_pending" => user.approval_pending,
"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
@@
-106,7
+109,7
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
end
def merge_account_views(%User{} = user) do
end
def merge_account_views(%User{} = user) do
- MastodonAPI.AccountView.render("show.json", %{user: user})
+ MastodonAPI.AccountView.render("show.json", %{user: user
, skip_visibility_check: true
})
|> Map.merge(AdminAPI.AccountView.render("show.json", %{user: user}))
end
|> Map.merge(AdminAPI.AccountView.render("show.json", %{user: user}))
end