diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-04-29 06:45:18 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-04-29 06:45:18 +0000 |
| commit | 0fd176b990887c170928bc0ce7d43d3a0aab8f7f (patch) | |
| tree | d6e300a9e561fe67e04f37d7e679a5afa4d4c157 /lib | |
| parent | 8e266e02da15275c4e17533a50ee4c0eaf65227f (diff) | |
| parent | ce3789e39ab0b63e634d583cbafbda7a9e4d7550 (diff) | |
| download | pleroma-0fd176b990887c170928bc0ce7d43d3a0aab8f7f.tar.gz | |
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 9179a2682..811a45c79 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -103,6 +103,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do {:ok, ControllerHelper.truthy_param?(value)} end) end) + |> add_if_present(params, "default_scope", :default_scope) |> add_if_present(params, "header", :banner, fn value -> with %Plug.Upload{} <- value, {:ok, object} <- ActivityPub.upload(value, type: :banner) do |