commit: 3242cfef20ea05bae53761ffaf54347c4c6f7bda
parent 4ead0d564fa60b1a908f6237474250d6bda85ae9
Author: Mark Felder <feld@FreeBSD.org>
Date: Wed, 14 Oct 2020 09:54:07 -0500
Undo API breaking changes
Diffstat:
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/pleroma/web/api_spec/operations/account_operation.ex b/lib/pleroma/web/api_spec/operations/account_operation.ex
@@ -606,7 +606,7 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
description: "Sets the background image of the user.",
format: :binary
},
- is_discoverable: %Schema{
+ discoverable: %Schema{
allOf: [BooleanLike],
nullable: true,
description:
@@ -630,7 +630,7 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
pleroma_settings_store: %{"pleroma-fe" => %{"key" => "val"}},
skip_thread_containment: false,
allow_following_move: false,
- is_discoverable: false,
+ discoverable: false,
actor_type: "Person"
}
}
diff --git a/lib/pleroma/web/api_spec/operations/chat_operation.ex b/lib/pleroma/web/api_spec/operations/chat_operation.ex
@@ -253,7 +253,7 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
"sensitive" => false,
"note" => "lain",
"pleroma" => %{
- "is_discoverable" => false,
+ "discoverable" => false,
"actor_type" => "Person"
},
"fields" => []
diff --git a/lib/pleroma/web/api_spec/schemas/account.ex b/lib/pleroma/web/api_spec/schemas/account.ex
@@ -124,7 +124,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
type: :object,
properties: %{
actor_type: ActorType,
- is_discoverable: %Schema{
+ discoverable: %Schema{
type: :boolean,
description:
"whether the user allows discovery of the account in search results and other services."
@@ -205,7 +205,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
"note" => "foobar",
"pleroma" => %{
"actor_type" => "Person",
- "is_discoverable" => false,
+ "discoverable" => false,
"no_rich_text" => false,
"show_role" => true
},
diff --git a/test/pleroma/web/mastodon_api/update_credentials_test.exs b/test/pleroma/web/mastodon_api/update_credentials_test.exs
@@ -147,14 +147,14 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
end
test "updates the user's discoverable status", %{conn: conn} do
- assert %{"source" => %{"pleroma" => %{"is_discoverable" => true}}} =
+ assert %{"source" => %{"pleroma" => %{"discoverable" => true}}} =
conn
- |> patch("/api/v1/accounts/update_credentials", %{is_discoverable: "true"})
+ |> patch("/api/v1/accounts/update_credentials", %{discoverable: "true"})
|> json_response_and_validate_schema(:ok)
- assert %{"source" => %{"pleroma" => %{"is_discoverable" => false}}} =
+ assert %{"source" => %{"pleroma" => %{"discoverable" => false}}} =
conn
- |> patch("/api/v1/accounts/update_credentials", %{is_discoverable: "false"})
+ |> patch("/api/v1/accounts/update_credentials", %{discoverable: "false"})
|> json_response_and_validate_schema(:ok)
end