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

[#2456] OpenAPI: added embed_relationships param definition.

Browse Source
This commit is contained in:
Ivan Tashkinov 2020-05-12 20:55:01 +03:00
parent 63a1a82f38
commit bfb48e3db6
3 changed files with 73 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pleroma/web/api_spec/helpers.ex
View File

@ -47,6 +47,15 @@ defmodule Pleroma.Web.ApiSpec.Helpers do
] ]
end end
def embed_relationships_param do
Operation.parameter(
:embed_relationships,
:query,
:boolean,
"Embed relationships into accounts (Pleroma extension)"
)
end
def empty_object_response do def empty_object_response do
Operation.response("Empty object", "application/json", %Schema{type: :object, example: %{}}) Operation.response("Empty object", "application/json", %Schema{type: :object, example: %{}})
end end

6
lib/pleroma/web/api_spec/operations/account_operation.ex
View File

@ -156,7 +156,8 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
description: description:
"Accounts which follow the given account, if network is not hidden by the account owner.", "Accounts which follow the given account, if network is not hidden by the account owner.",
parameters: parameters:
[%Reference{"$ref": "#/components/parameters/accountIdOrNickname"}] ++ pagination_params(), [%Reference{"$ref": "#/components/parameters/accountIdOrNickname"}] ++
pagination_params() ++ [embed_relationships_param()],
responses: %{ responses: %{
200 => Operation.response("Accounts", "application/json", array_of_accounts()) 200 => Operation.response("Accounts", "application/json", array_of_accounts())
} }
@ -172,7 +173,8 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
description: description:
"Accounts which the given account is following, if network is not hidden by the account owner.", "Accounts which the given account is following, if network is not hidden by the account owner.",
parameters: parameters:
[%Reference{"$ref": "#/components/parameters/accountIdOrNickname"}] ++ pagination_params(), [%Reference{"$ref": "#/components/parameters/accountIdOrNickname"}] ++
pagination_params() ++ [embed_relationships_param()],
responses: %{200 => Operation.response("Accounts", "application/json", array_of_accounts())} responses: %{200 => Operation.response("Accounts", "application/json", array_of_accounts())}
} }
end end

15
lib/pleroma/web/api_spec/operations/search_operation.ex
View File

@ -24,7 +24,8 @@ defmodule Pleroma.Web.ApiSpec.SearchOperation do
tags: ["Search"], tags: ["Search"],
summary: "Search for matching accounts by username or display name", summary: "Search for matching accounts by username or display name",
operationId: "SearchController.account_search", operationId: "SearchController.account_search",
parameters: [ parameters:
[
Operation.parameter(:q, :query, %Schema{type: :string}, "What to search for", Operation.parameter(:q, :query, %Schema{type: :string}, "What to search for",
required: true required: true
), ),
@ -46,7 +47,7 @@ defmodule Pleroma.Web.ApiSpec.SearchOperation do
%Schema{allOf: [BooleanLike], default: false}, %Schema{allOf: [BooleanLike], default: false},
"Only include accounts that the user is following" "Only include accounts that the user is following"
) )
], ] ++ [embed_relationships_param()],
responses: %{ responses: %{
200 => 200 =>
Operation.response( Operation.response(
@ -65,7 +66,8 @@ defmodule Pleroma.Web.ApiSpec.SearchOperation do
security: [%{"oAuth" => ["read:search"]}], security: [%{"oAuth" => ["read:search"]}],
operationId: "SearchController.search", operationId: "SearchController.search",
deprecated: true, deprecated: true,
parameters: [ parameters:
[
Operation.parameter( Operation.parameter(
:account_id, :account_id,
:query, :query,
@ -78,7 +80,9 @@ defmodule Pleroma.Web.ApiSpec.SearchOperation do
%Schema{type: :string, enum: ["accounts", "hashtags", "statuses"]}, %Schema{type: :string, enum: ["accounts", "hashtags", "statuses"]},
"Search type" "Search type"
), ),
Operation.parameter(:q, :query, %Schema{type: :string}, "The search query", required: true), Operation.parameter(:q, :query, %Schema{type: :string}, "The search query",
required: true
),
Operation.parameter( Operation.parameter(
:resolve, :resolve,
:query, :query,
@ -97,8 +101,7 @@ defmodule Pleroma.Web.ApiSpec.SearchOperation do
%Schema{type: :integer}, %Schema{type: :integer},
"Offset" "Offset"
) )
| pagination_params() ] ++ pagination_params() ++ [embed_relationships_param()],
],
responses: %{ responses: %{
200 => Operation.response("Results", "application/json", results()) 200 => Operation.response("Results", "application/json", results())
} }