summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-07-13 23:51:32 -0500
committerAlex Gleason <alex@alexgleason.me>2021-07-14 08:54:59 -0500
commit167e14416bec2846d3282a121cfcfd147a04a8bf (patch)
treeecc2d2bb47b1d695493817d5bb3d1fb87810e471
parentb221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (diff)
AdminAPI: add date to users
-rw-r--r--lib/pleroma/web/admin_api/views/account_view.ex4
-rw-r--r--test/pleroma/web/admin_api/controllers/user_controller_test.exs3
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex
index d7c63d385..022e97489 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
diff --git a/test/pleroma/web/admin_api/controllers/user_controller_test.exs b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
index beb8a5d58..6c410e94c 100644
--- a/test/pleroma/web/admin_api/controllers/user_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
@@ -907,7 +907,8 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
"is_approved" => true,
"url" => user.ap_id,
"registration_reason" => nil,
- "actor_type" => "Person"
+ "actor_type" => "Person",
+ "created_at" => CommonAPI.Utils.to_masto_date(user.inserted_at)
}
|> Map.merge(attrs)
end