diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-01-06 14:59:03 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-01-06 14:59:03 -0600 |
| commit | 490ca3be583aca9ad43cf4fd3aafeb6f462f388f (patch) | |
| tree | cba1788f093300a00ee0145cfdda99d4f0e0b4dc | |
| parent | 4c76e3e3b704b1213d3c6220b81d56b72d8fc7db (diff) | |
| download | pleroma-490ca3be583aca9ad43cf4fd3aafeb6f462f388f.tar.gz | |
AdminAPI: return last_known_ip, fixes #1708
| -rw-r--r-- | lib/pleroma/web/admin_api/views/account_view.ex | 3 | ||||
| -rw-r--r-- | test/pleroma/web/admin_api/controllers/user_controller_test.exs | 3 |
2 files changed, 4 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 8bac24d3e..4f9cba89d 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -80,7 +80,8 @@ defmodule Pleroma.Web.AdminAPI.AccountView do "approval_pending" => user.approval_pending, "url" => user.uri || user.ap_id, "registration_reason" => user.registration_reason, - "actor_type" => user.actor_type + "actor_type" => user.actor_type, + "last_known_ip" => user.last_known_ip } 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 5705306c7..7d9c6b2ad 100644 --- a/test/pleroma/web/admin_api/controllers/user_controller_test.exs +++ b/test/pleroma/web/admin_api/controllers/user_controller_test.exs @@ -963,7 +963,8 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do "approval_pending" => false, "url" => user.ap_id, "registration_reason" => nil, - "actor_type" => "Person" + "actor_type" => "Person", + "last_known_ip" => nil } |> Map.merge(attrs) end |