diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-05-19 06:56:44 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-05-19 06:56:44 +0000 |
| commit | 7e3814390e3e2695c514953562314bf46c1e49b0 (patch) | |
| tree | 5b56d90775e733960c336f370d0b7e70b963ac65 /lib | |
| parent | 86f50a809f3237b98b8631262fe653839834915a (diff) | |
| parent | 41f8f172609910efc9543632fecbd544d131535b (diff) | |
| download | pleroma-7e3814390e3e2695c514953562314bf46c1e49b0.tar.gz pleroma-7e3814390e3e2695c514953562314bf46c1e49b0.zip | |
Merge branch 'issue/1667' into 'develop'
[#1667] fix api/v1/accounts/update_credentials
See merge request pleroma/pleroma!2556
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex index ef41f9e96..75512442d 100644 --- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex @@ -177,6 +177,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do ) |> add_if_present(params, :pleroma_settings_store, :pleroma_settings_store) |> add_if_present(params, :default_scope, :default_scope) + |> add_if_present(params["source"], "privacy", :default_scope) |> add_if_present(params, :actor_type, :actor_type) changeset = User.update_changeset(user, user_params) @@ -189,7 +190,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do end defp add_if_present(map, params, params_field, map_field, value_function \\ &{:ok, &1}) do - with true <- Map.has_key?(params, params_field), + with true <- is_map(params), + true <- Map.has_key?(params, params_field), {:ok, new_value} <- value_function.(Map.get(params, params_field)) do Map.put(map, map_field, new_value) else |