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

Merge branch 'fix/openapi-relationship-nullable' into 'develop' 

Account schema: specify that pleroma.relationship is nullable

See merge request pleroma/pleroma!3299
This commit is contained in:
rinpatch 2021-02-03 15:14:40 +00:00
parent d2acf3a92f 74ef1a044d
commit a7864a9429
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ def with_relationships_param do
:with_relationships, :with_relationships,
:query, :query,
BooleanLike, BooleanLike,
"Embed relationships into accounts." "Embed relationships into accounts. **If this parameter is not set account's `pleroma.relationship` is going to be `null`.**"
) )
end end

2
lib/pleroma/web/api_spec/schemas/account.ex
View File

@ -96,7 +96,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
hide_notification_contents: %Schema{type: :boolean} hide_notification_contents: %Schema{type: :boolean}
} }
}, },
relationship: AccountRelationship, relationship: %Schema{allOf: [AccountRelationship], nullable: true},
settings_store: %Schema{ settings_store: %Schema{
type: :object, type: :object,
description: description:

2
lib/pleroma/web/api_spec/schemas/account_relationship.ex
View File

@ -10,7 +10,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.AccountRelationship do
OpenApiSpex.schema(%{ OpenApiSpex.schema(%{
title: "AccountRelationship", title: "AccountRelationship",
description: "Response schema for relationship", description: "Relationship between current account and requested account",
type: :object, type: :object,
properties: %{ properties: %{
blocked_by: %Schema{type: :boolean}, blocked_by: %Schema{type: :boolean},