squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AdminAPI: return last_known_ip, fixes #1708

Browse Source
This commit is contained in:
Alex Gleason 2021-01-06 14:59:03 -06:00
parent 4c76e3e3b7
commit 490ca3be58
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/admin_api/views/account_view.ex
View File

@ -80,7 +80,8 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
"approval_pending" => user.approval_pending, "approval_pending" => user.approval_pending,
"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,
"last_known_ip" => user.last_known_ip
} }
end end

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

@ -963,7 +963,8 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
"approval_pending" => false, "approval_pending" => false,
"url" => user.ap_id, "url" => user.ap_id,
"registration_reason" => nil, "registration_reason" => nil,
"actor_type" => "Person" "actor_type" => "Person",
"last_known_ip" => nil
} }
|> Map.merge(attrs) |> Map.merge(attrs)
end end