hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add pagination for Blocks

Browse source
This commit is contained in:
Egor Kislitsyn 2020-10-13 21:39:41 +04:00
commit 33f4f39b1c
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
3 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/api_spec/operations/account_operation.ex
View file

@ -348,6 +348,7 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
operationId: "AccountController.blocks",
description: "View your blocks. See also accounts/:id/{block,unblock}",
security: [%{"oAuth" => ["read:blocks"]}],
parameters: pagination_params(),
responses: %{
200 => Operation.response("Accounts", "application/json", array_of_accounts())
}

12
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View file

@ -448,9 +448,15 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
end
@doc "GET /api/v1/blocks"
def blocks(%{assigns: %{user: user}} = conn, _) do
users = User.blocked_users(user, _restrict_deactivated = true)
render(conn, "index.json", users: users, for: user, as: :user)
def blocks(%{assigns: %{user: user}} = conn, params) do
users =
user
|> User.blocked_users_relation(_restrict_deactivated = true)
|> Pleroma.Pagination.fetch_paginated(Map.put(params, :skip_order, true))
conn
|> add_link_headers(users)
|> render("index.json", users: users, for: user, as: :user)
end
@doc "GET /api/v1/endorsements"