Merge branch 'develop' into refactor/discoverable_user_field

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index b04b72106a33f5828ddf6fffa513da124efa2983,8022f0402be73bcdb4f87ba5a1cffe9bcb4ddd90..9c33775f2aa70c35da0bfd48c2879129523aec67
--- 1/lib/pleroma/web/activity_pub/activity_pub.ex
--- 2/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -1257,8 -1257,8 +1257,8 @@@ defmodule Pleroma.Web.ActivityPub.Activ
        banner: banner,
        fields: fields,
        emoji: emojis,
-       locked: locked,
+       is_locked: is_locked,
 -      discoverable: discoverable,
 +      is_discoverable: is_discoverable,
        invisible: invisible,
        avatar: avatar,
        name: data["name"],

diff --cc lib/pleroma/web/activity_pub/views/user_view.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 9d2f42da95ee8c0df19ded7f5d323cb826fb90c5,97858a93c5d6126782e4724177527b99efa460d7..3cfdab91461784be778748522c52d781ede96ce7
--- 1/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
--- 2/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@@ -209,7 -209,7 +208,8 @@@ defmodule Pleroma.Web.MastodonAPI.Accou
          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])
 +      |> Maps.put_if_present(:is_discoverable, params[:discoverable])
  
      # What happens here:
      #

diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge

diff --cc test/pleroma/user_test.exs
Simple merge