aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2021-07-14 14:35:21 +0000
committerfeld <feld@feld.me>2021-07-14 14:35:21 +0000
commit17d79f3484e790fcfc8172ab5eb62a9af46106fb (patch)
tree1d310a7fbb880a4b5b3cb38872653eac00e7b13e /lib
parent173e977e283789a814278c63bc81f40a13942e21 (diff)
parent117b3edf54bef4b2d9c2e13d584da7f14923e998 (diff)
downloadpleroma-17d79f3484e790fcfc8172ab5eb62a9af46106fb.tar.gz
Merge branch 'admin-api-users-date' into 'develop'
AdminAPI: add created_at date to users See merge request pleroma/pleroma!3482
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/admin_api/views/account_view.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex
index e053a9b67..fae0c07f0 100644
--- a/lib/pleroma/web/admin_api/views/account_view.ex
+++ b/lib/pleroma/web/admin_api/views/account_view.ex
@@ -8,6 +8,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
alias Pleroma.User
alias Pleroma.Web.AdminAPI
alias Pleroma.Web.AdminAPI.AccountView
+ alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI
alias Pleroma.Web.MediaProxy
@@ -81,7 +82,8 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
"is_approved" => user.is_approved,
"url" => user.uri || user.ap_id,
"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