stefan230/akkoma
1
0
Fork 0
forked from YokaiRick/akkoma
Code Pull requests Activity

AdminAPI: add date to users

Browse source
This commit is contained in:
Alex Gleason 2021-07-13 23:51:32 -05:00
parent b221d77a6d
commit 167e14416b
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/admin_api/views/account_view.ex
View file

@ -8,6 +8,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.AdminAPI alias Pleroma.Web.AdminAPI
alias Pleroma.Web.AdminAPI.AccountView alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI alias Pleroma.Web.MastodonAPI
alias Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy
@ -81,7 +82,8 @@ def render("show.json", %{user: user}) do
"is_approved" => user.is_approved, "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 "actor_type" => user.actor_type,
"created_at" => CommonAPI.Utils.to_masto_date(user.inserted_at)
} }
end end

3
test/pleroma/web/admin_api/controllers/user_controller_test.exs
View file

@ -907,7 +907,8 @@ defp user_response(user, attrs \\ %{}) do
"is_approved" => true, "is_approved" => true,
"url" => user.ap_id, "url" => user.ap_id,
"registration_reason" => nil, "registration_reason" => nil,
"actor_type" => "Person" "actor_type" => "Person",
"created_at" => CommonAPI.Utils.to_masto_date(user.inserted_at)
} }
|> Map.merge(attrs) |> Map.merge(attrs)
end end