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 refactor/discoverable_user_field
[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 120159527abefe8259b52ff4624a09ecacd23137..5f3a78a0ffc6f6ae7fd0c59c8e9d7cd092b5b0c2 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/account_view.ex
+++ b/
lib/pleroma/web/admin_api/views/account_view.ex
@@
-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(%{
@@
-76,7
+76,11
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
"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
+ "confirmation_pending" => user.confirmation_pending,
+ "approval_pending" => user.approval_pending,
+ "url" => user.uri || user.ap_id,
+ "registration_reason" => user.registration_reason,
+ "actor_type" => user.actor_type
}
end
}
end
@@
-104,7
+108,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