Browse Source

Merge branch 'admin-api-users-date' into 'develop'

AdminAPI: add created_at date to users

See merge request pleroma/pleroma!3482
features/ingestion-listen
feld 2 years ago
parent
commit
17d79f3484
3 changed files with 6 additions and 2 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +3
    -1
      lib/pleroma/web/admin_api/views/account_view.ex
  3. +2
    -1
      test/pleroma/web/admin_api/controllers/user_controller_test.exs

+ 1
- 0
CHANGELOG.md View File

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

- MRF (`FollowBotPolicy`): New MRF Policy which makes a designated local Bot account attempt to follow all users in public Notes received by your instance. Users who require approving follower requests or have #nobot in their profile are excluded.
- Return OAuth token `id` (primary key) in POST `/oauth/token`.
- AdminAPI: return `created_at` date with users.
- `AnalyzeMetadata` upload filter for extracting image/video attachment dimensions and generating blurhashes for images. Blurhashes for videos are not generated at this time.
- Attachment dimensions and blurhashes are federated when available.
- Pinned posts federation


+ 3
- 1
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.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



+ 2
- 1
test/pleroma/web/admin_api/controllers/user_controller_test.exs View File

@@ -921,7 +921,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


Loading…
Cancel
Save