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

Support pagination in AdminAPI for user statuses

Browse Source
This commit is contained in:
Mark Felder 2020-12-30 14:36:04 -06:00
parent 38924166eb
commit 4c5f75f4e9
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
View File

@ -103,11 +103,12 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
godmode = params["godmode"] == "true" || params["godmode"] == true
with %User{} = user <- User.get_cached_by_nickname_or_id(nickname, for: admin) do
{_, page_size} = page_params(params)
{page, page_size} = page_params(params)
activities =
ActivityPub.fetch_user_activities(user, nil, %{
ActivityPub.fetch_statuses(user, %{
limit: page_size,
offset: (page - 1) * page_size,
godmode: godmode,
exclude_reblogs: not with_reblogs
})

16
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
View File

@ -422,10 +422,20 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
assert json_response(conn, 200) |> length() == 3
end
test "renders user's statuses with a limit", %{conn: conn, user: user} do
conn = get(conn, "/api/pleroma/admin/users/#{user.nickname}/statuses?page_size=2")
test "renders user's statuses with pagination", %{conn: conn, user: user} do
conn1 = get(conn, "/api/pleroma/admin/users/#{user.nickname}/statuses?page_size=1&page=1")
assert json_response(conn, 200) |> length() == 2
response1 = json_response(conn1, 200)
assert response1 |> length() == 1
conn2 = get(conn, "/api/pleroma/admin/users/#{user.nickname}/statuses?page_size=1&page=2")
response2 = json_response(conn2, 200)
assert response2 |> length() == 1
refute response1 == response2
end
test "doesn't return private statuses by default", %{conn: conn, user: user} do