Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel

[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 e1825c5f1401111aa58e24682dc1f1dbc57ac79e..d9dba5c5181693044ea8df1bb9f70900d8bdca40 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,10 @@
 defmodule Pleroma.Web.AdminAPI.AccountView do
   use Pleroma.Web, :view
 
-  alias Pleroma.User.Info
+  alias Pleroma.HTML
+  alias Pleroma.User
   alias Pleroma.Web.AdminAPI.AccountView
+  alias Pleroma.Web.MediaProxy
 
   def render("index.json", %{users: users, count: count, page_size: page_size}) do
     %{
@@ -16,14 +18,26 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
     }
   end
 
+  def render("index.json", %{users: users}) do
+    %{
+      users: render_many(users, AccountView, "show.json", as: :user)
+    }
+  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,
+      "avatar" => avatar,
       "nickname" => user.nickname,
-      "deactivated" => user.info.deactivated,
+      "display_name" => display_name,
+      "deactivated" => user.deactivated,
       "local" => user.local,
-      "roles" => Info.roles(user.info),
-      "tags" => user.tags || []
+      "roles" => User.roles(user),
+      "tags" => user.tags || [],
+      "confirmation_pending" => user.confirmation_pending
     }
   end
 
@@ -48,7 +62,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
   def render("created.json", %{user: user}) do
     %{
       type: "success",
-      code: 201,
+      code: 200,
       data: %{
         nickname: user.nickname,
         email: user.email