diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-26 02:57:42 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-26 02:57:42 +0000 |
| commit | 59ae9255fbf7abd6efe46799b19c094724f5d51b (patch) | |
| tree | 21985ed6d20990b264806c04ef95c9e088d7074b /lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex | |
| parent | 3ff57f1fd3f7529f2c657a3940b1727b8a2df527 (diff) | |
| parent | 5fb72170a72e61f0b8035fba63b7bbdff7acde05 (diff) | |
| download | pleroma-59ae9255fbf7abd6efe46799b19c094724f5d51b.tar.gz | |
Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' into 'develop'
Activitypub/Add `discoverable` parameter in ActivityPub actor
See merge request pleroma/pleroma!1641
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index bb81b061e..239cfac9f 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -153,7 +153,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do :hide_follows, :hide_favorites, :show_role, - :skip_thread_containment + :skip_thread_containment, + :discoverable ] |> Enum.reduce(%{}, fn key, acc -> add_if_present(acc, params, to_string(key), key, fn value -> |