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

Undo API breaking changes

Browse source
This commit is contained in:
Mark Felder 2020-10-14 11:03:17 -05:00
parent 8b20c4d275
commit ed61002815
8 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -519,7 +519,7 @@ defp update_credentials_request do
description: "Header image encoded using multipart/form-data",
format: :binary
},
is_locked: %Schema{
locked: %Schema{
allOf: [BooleanLike],
nullable: true,
description: "Whether manual approval of follow requests is required."

2
lib/pleroma/web/api_spec/operations/chat_operation.ex
View file

@ -259,7 +259,7 @@ def chats_response do
"fields" => []
},
"statuses_count" => 1,
"is_locked" => false,
"locked" => false,
"created_at" => "2020-04-16T13:40:15.000Z",
"display_name" => "lain",
"fields" => [],

4
lib/pleroma/web/api_spec/schemas/account.ex
View file

@ -32,7 +32,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
header_static: %Schema{type: :string, format: :uri},
header: %Schema{type: :string, format: :uri},
id: FlakeID,
is_locked: %Schema{type: :boolean},
locked: %Schema{type: :boolean},
note: %Schema{type: :string, format: :html},
statuses_count: %Schema{type: :integer},
url: %Schema{type: :string, format: :uri},
@ -159,7 +159,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
"header" => "https://mypleroma.com/images/banner.png",
"header_static" => "https://mypleroma.com/images/banner.png",
"id" => "9tKi3esbG7OQgZ2920",
"is_locked" => false,
"locked" => false,
"note" => "cofe",
"pleroma" => %{
"allow_following_move" => true,

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

@ -177,7 +177,6 @@ def update_credentials(%{assigns: %{user: user}, body_params: params} = conn, _p
user_params =
[
:no_rich_text,
:is_locked,
:hide_followers_count,
:hide_follows_count,
:hide_followers,
@ -210,6 +209,7 @@ def update_credentials(%{assigns: %{user: user}, body_params: params} = conn, _p
if bot, do: {:ok, "Service"}, else: {:ok, "Person"}
end)
|> Maps.put_if_present(:actor_type, params[:actor_type])
|> Maps.put_if_present(:is_locked, params[:locked])
# What happens here:
#

2
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -242,7 +242,7 @@ defp do_render("show.json", %{user: user} = opts) do
username: username_from_nickname(user.nickname),
acct: user.nickname,
display_name: display_name,
is_locked: user.is_locked,
locked: user.is_locked,
created_at: Utils.to_masto_date(user.inserted_at),
followers_count: followers_count,
following_count: following_count,

2
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
View file

@ -1271,7 +1271,7 @@ test "registration from trusted app" do
"follow_requests_count" => 0,
"followers_count" => 0,
"following_count" => 0,
"is_locked" => false,
"locked" => false,
"note" => "",
"source" => %{
"fields" => [],

4
test/pleroma/web/mastodon_api/update_credentials_test.exs
View file

@ -102,10 +102,10 @@ test "updates the user's bio", %{conn: conn} do
end
test "updates the user's locking status", %{conn: conn} do
conn = patch(conn, "/api/v1/accounts/update_credentials", %{is_locked: "true"})
conn = patch(conn, "/api/v1/accounts/update_credentials", %{locked: "true"})
assert user_data = json_response_and_validate_schema(conn, 200)
assert user_data["is_locked"] == true
assert user_data["locked"] == true
end
test "updates the user's chat acceptance status", %{conn: conn} do

24
test/pleroma/web/mastodon_api/views/account_view_test.exs
View file

@ -43,7 +43,7 @@ test "Represent a user account" do
username: "shp",
acct: user.nickname,
display_name: user.name,
is_locked: false,
locked: false,
created_at: "2017-08-15T15:47:06.000Z",
followers_count: 3,
following_count: 0,
@ -148,7 +148,7 @@ test "Represent a Service(bot) account" do
username: "shp",
acct: user.nickname,
display_name: user.name,
is_locked: false,
locked: false,
created_at: "2017-08-15T15:47:06.000Z",
followers_count: 3,
following_count: 0,
@ -483,60 +483,60 @@ test "shows zero when no follow requests are pending" do
test "shows non-zero when follow requests are pending" do
user = insert(:user, is_locked: true)
assert %{is_locked: true} = AccountView.render("show.json", %{user: user, for: user})
assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
other_user = insert(:user)
{:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
assert %{is_locked: true, follow_requests_count: 1} =
assert %{locked: true, follow_requests_count: 1} =
AccountView.render("show.json", %{user: user, for: user})
end
test "decreases when accepting a follow request" do
user = insert(:user, is_locked: true)
assert %{is_locked: true} = AccountView.render("show.json", %{user: user, for: user})
assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
other_user = insert(:user)
{:ok, other_user, user, _activity} = CommonAPI.follow(other_user, user)
assert %{is_locked: true, follow_requests_count: 1} =
assert %{locked: true, follow_requests_count: 1} =
AccountView.render("show.json", %{user: user, for: user})
{:ok, _other_user} = CommonAPI.accept_follow_request(other_user, user)
assert %{is_locked: true, follow_requests_count: 0} =
assert %{locked: true, follow_requests_count: 0} =
AccountView.render("show.json", %{user: user, for: user})
end
test "decreases when rejecting a follow request" do
user = insert(:user, is_locked: true)
assert %{is_locked: true} = AccountView.render("show.json", %{user: user, for: user})
assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
other_user = insert(:user)
{:ok, other_user, user, _activity} = CommonAPI.follow(other_user, user)
assert %{is_locked: true, follow_requests_count: 1} =
assert %{locked: true, follow_requests_count: 1} =
AccountView.render("show.json", %{user: user, for: user})
{:ok, _other_user} = CommonAPI.reject_follow_request(other_user, user)
assert %{is_locked: true, follow_requests_count: 0} =
assert %{locked: true, follow_requests_count: 0} =
AccountView.render("show.json", %{user: user, for: user})
end
test "shows non-zero when historical unapproved requests are present" do
user = insert(:user, is_locked: true)
assert %{is_locked: true} = AccountView.render("show.json", %{user: user, for: user})
assert %{locked: true} = AccountView.render("show.json", %{user: user, for: user})
other_user = insert(:user)
{:ok, _other_user, user, _activity} = CommonAPI.follow(other_user, user)
{:ok, user} = User.update_and_set_cache(user, %{is_locked: false})
assert %{is_locked: false, follow_requests_count: 1} =
assert %{locked: false, follow_requests_count: 1} =
AccountView.render("show.json", %{user: user, for: user})
end
end