diff options
| author | lain <lain@soykaf.club> | 2021-01-05 13:33:57 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-05 13:33:57 +0100 |
| commit | fee0c6a2cb058282ee6c3960730201f58b691270 (patch) | |
| tree | 9a5e0057d20651fbde1fe8180cabf7744a3a26ca /lib/pleroma/web/mastodon_api/controllers/account_controller.ex | |
| parent | 7b44605cb89943a905f6a0a7aab9ebeea58aa7ab (diff) | |
| parent | 7a03b112f2ae0acbb546975a3cb57f63ab69708d (diff) | |
| download | pleroma-fee0c6a2cb058282ee6c3960730201f58b691270.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/account_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex index b4375872b..3951d10ac 100644 --- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex @@ -184,6 +184,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do :show_role, :skip_thread_containment, :allow_following_move, + :also_known_as, :accepts_chat_messages ] |> Enum.reduce(%{}, fn key, acc -> @@ -207,6 +208,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(:also_known_as, params[:also_known_as]) # Note: param name is indeed :locked (not an error) |> Maps.put_if_present(:is_locked, params[:locked]) # Note: param name is indeed :discoverable (not an error) |