From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 15 Oct 2020 21:39:01 +0000 (-0500)
Subject: Merge branch 'develop' into refactor/discoverable_user_field
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fb056ce05b43841ce57135ffb0b25845c41639ef;p=akkoma

Merge branch 'develop' into refactor/discoverable_user_field
---

fb056ce05b43841ce57135ffb0b25845c41639ef
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index b04b72106,8022f0402..9c33775f2
--- a/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/mastodon_api/controllers/account_controller.ex
index 9d2f42da9,97858a93c..3cfdab914
--- a/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:
      #