Undo API breaking changes

diff --git a/lib/pleroma/web/api_spec/operations/account_operation.ex b/lib/pleroma/web/api_spec/operations/account_operation.ex
index 57f25e1d8269cc367ac25a41af30b47d9816f877..d90ddb78714151d513b798bc99e11e1db275dca0 100644 (file)
--- a/lib/pleroma/web/api_spec/operations/account_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/account_operation.ex
@@ -519,7 +519,7 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation 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."

diff --git a/lib/pleroma/web/api_spec/operations/chat_operation.ex b/lib/pleroma/web/api_spec/operations/chat_operation.ex
index df786e480b77e2671a832479ed8e042aafd822db..0dcfdb35467ef2e04f5493ef04546bb124bffd9b 100644 (file)
--- a/lib/pleroma/web/api_spec/operations/chat_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/chat_operation.ex
@@ -259,7 +259,7 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
               "fields" => []
             },
             "statuses_count" => 1,
-            "is_locked" => false,
+            "locked" => false,
             "created_at" => "2020-04-16T13:40:15.000Z",
             "display_name" => "lain",
             "fields" => [],

diff --git a/lib/pleroma/web/api_spec/schemas/account.ex b/lib/pleroma/web/api_spec/schemas/account.ex
index b8ddf4ab8c3ed1d7017f5fc79d3acf22c58f2c21..ca79f0747861b93bb63e5d40022878369ffad247 100644 (file)
--- a/lib/pleroma/web/api_spec/schemas/account.ex
+++ b/lib/pleroma/web/api_spec/schemas/account.ex
@@ -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,

diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 5b3980c715b01e318ce75d3eaef88b82d677632a..97858a93c5d6126782e4724177527b99efa460d7 100644 (file)
--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@ -177,7 +177,6 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
     user_params =
       [
         :no_rich_text,
-        :is_locked,
         :hide_followers_count,
         :hide_follows_count,
         :hide_followers,
@@ -210,6 +209,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
         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:
     #

diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index f382c05a3bcd5083f60d1fd3e47999e553939782..d54cae732f614dfa598e0c9e61f09142fadd316b 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -242,7 +242,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView 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,

diff --git a/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
index 5164063beb9e482720a68a62c99634bb06bfe9e1..0b803b7ab11c14d227e1b7a00dcdd447fe7c504e 100644 (file)
--- a/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
@@ -1271,7 +1271,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
                "follow_requests_count" => 0,
                "followers_count" => 0,
                "following_count" => 0,
-               "is_locked" => false,
+               "locked" => false,
                "note" => "",
                "source" => %{
                  "fields" => [],

diff --git a/test/pleroma/web/mastodon_api/update_credentials_test.exs b/test/pleroma/web/mastodon_api/update_credentials_test.exs
index 9340b3ae0588c8e15552549faf6ae6715d303c12..fe462caa38c07739e182c264093c2ab774280c51 100644 (file)
--- a/test/pleroma/web/mastodon_api/update_credentials_test.exs
+++ b/test/pleroma/web/mastodon_api/update_credentials_test.exs
@@ -102,10 +102,10 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest 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

diff --git a/test/pleroma/web/mastodon_api/views/account_view_test.exs b/test/pleroma/web/mastodon_api/views/account_view_test.exs
index 90b436376063ca178c4c02a0238e60bb03186486..203e61c716a74fa38512cca633c32219f3d70e94 100644 (file)
--- a/test/pleroma/web/mastodon_api/views/account_view_test.exs
+++ b/test/pleroma/web/mastodon_api/views/account_view_test.exs
@@ -43,7 +43,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest 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 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest 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 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest 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