projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/force-password-reset' into 'develop'
[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 cccdeff7e93f1abe4c66043fd5d487b4b612c348..a96affd40cbe4800b0b213c287144688f505ac62 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/account_view.ex
+++ b/
lib/pleroma/web/admin_api/views/account_view.ex
@@
-5,8
+5,11
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
use Pleroma.Web, :view
defmodule Pleroma.Web.AdminAPI.AccountView do
use Pleroma.Web, :view
+ alias Pleroma.HTML
+ alias Pleroma.User
alias Pleroma.User.Info
alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.User.Info
alias Pleroma.Web.AdminAPI.AccountView
+ alias Pleroma.Web.MediaProxy
def render("index.json", %{users: users, count: count, page_size: page_size}) do
%{
def render("index.json", %{users: users, count: count, page_size: page_size}) do
%{
@@
-17,9
+20,14
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
end
def render("show.json", %{user: user}) do
end
def render("show.json", %{user: user}) do
+ avatar = User.avatar_url(user) |> MediaProxy.url()
+ display_name = HTML.strip_tags(user.name || user.nickname)
+
%{
"id" => user.id,
%{
"id" => user.id,
+ "avatar" => avatar,
"nickname" => user.nickname,
"nickname" => user.nickname,
+ "display_name" => display_name,
"deactivated" => user.info.deactivated,
"local" => user.local,
"roles" => Info.roles(user.info),
"deactivated" => user.info.deactivated,
"local" => user.local,
"roles" => Info.roles(user.info),