From ed6973d3d9b6bba46f5112b49620a49b62c58d76 Mon Sep 17 00:00:00 2001 From: NEETzsche Date: Fri, 14 Jan 2022 20:52:31 +0000 Subject: [PATCH 1/2] Show blockers_visible in /api/v1/instance --- lib/pleroma/web/mastodon_api/views/instance_view.ex | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index 4acf4db8f6..427bbf3aa5 100644 --- a/lib/pleroma/web/mastodon_api/views/instance_view.ex +++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex @@ -39,6 +39,7 @@ def render("show.json", _) do background_image: Pleroma.Web.Endpoint.url() <> Keyword.get(instance, :background_image), shout_limit: Config.get([:shout, :limit]), description_limit: Keyword.get(instance, :description_limit), + blockers_visible: Config.get([:activitypub, :blockers_visible]), pleroma: %{ metadata: %{ account_activation_required: Keyword.get(instance, :account_activation_required), From bd5dbbac1f45f1852674309a0e5eaa7da663af91 Mon Sep 17 00:00:00 2001 From: NEETzsche Date: Fri, 14 Jan 2022 21:25:56 +0000 Subject: [PATCH 2/2] Put blockers_visible in the features list when it's enabled --- lib/pleroma/web/mastodon_api/views/instance_view.ex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index 427bbf3aa5..a560f0262a 100644 --- a/lib/pleroma/web/mastodon_api/views/instance_view.ex +++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex @@ -39,7 +39,6 @@ def render("show.json", _) do background_image: Pleroma.Web.Endpoint.url() <> Keyword.get(instance, :background_image), shout_limit: Config.get([:shout, :limit]), description_limit: Keyword.get(instance, :description_limit), - blockers_visible: Config.get([:activitypub, :blockers_visible]), pleroma: %{ metadata: %{ account_activation_required: Keyword.get(instance, :account_activation_required), @@ -68,6 +67,9 @@ def features do "shareable_emoji_packs", "multifetch", "pleroma:api/v1/notifications:include_types_filter", + if Config.get([:activitypub, :blockers_visible]) do + "blockers_visible" + end, if Config.get([:media_proxy, :enabled]) do "media_proxy" end,