diff options
| author | tusooa <tusooa@kazv.moe> | 2023-02-28 22:16:01 -0500 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2023-02-28 22:16:01 -0500 |
| commit | d83f16fe44210517ceec7bc7786728c1f4d81627 (patch) | |
| tree | bae36118150cc0e2c0ef99139db78d72855eec18 /lib | |
| parent | 8a0162cd9694a1c5bf131fefb6e6a8d3dcb68fae (diff) | |
| download | pleroma-d83f16fe44210517ceec7bc7786728c1f4d81627.tar.gz pleroma-d83f16fe44210517ceec7bc7786728c1f4d81627.zip | |
Allow with_relationships param for blocks
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/api_spec/operations/account_operation.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/pleroma/web/api_spec/operations/account_operation.ex b/lib/pleroma/web/api_spec/operations/account_operation.ex index 294590186..f2897a3a3 100644 --- a/lib/pleroma/web/api_spec/operations/account_operation.ex +++ b/lib/pleroma/web/api_spec/operations/account_operation.ex @@ -452,7 +452,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(), + parameters: [with_relationships_param() | pagination_params()], responses: %{ 200 => Operation.response("Accounts", "application/json", array_of_accounts()) } diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex index 02dfc552f..c313a0e97 100644 --- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex @@ -540,7 +540,12 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do conn |> add_link_headers(users) - |> render("index.json", users: users, for: user, as: :user) + |> render("index.json", + users: users, + for: user, + as: :user, + embed_relationships: embed_relationships?(params) + ) end @doc "GET /api/v1/accounts/lookup" |