aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-29 14:42:09 +0200
committerlain <lain@soykaf.club>2020-07-29 14:42:09 +0200
commitd9bf2c58df0a828901ab7cc66c5fd35d58a485ec (patch)
treeca5a82c8397de657c29084c183a71f1f5bb7b704 /lib/pleroma/web/mastodon_api
parentc25c21dd22202fe0fc827ef57e5a69631fa35bf7 (diff)
parent269b61a2402e3d12d09baf26ba73359776f556b0 (diff)
downloadpleroma-d9bf2c58df0a828901ab7cc66c5fd35d58a485ec.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
Diffstat (limited to 'lib/pleroma/web/mastodon_api')
-rw-r--r--lib/pleroma/web/mastodon_api/views/instance_view.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index cd3bc7f00..ea2d3aa9c 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -26,6 +26,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
thumbnail: Keyword.get(instance, :instance_thumbnail),
languages: ["en"],
registrations: Keyword.get(instance, :registrations_open),
+ approval_required: Keyword.get(instance, :account_approval_required),
# Extra (not present in Mastodon):
max_toot_chars: Keyword.get(instance, :limit),
poll_limits: Keyword.get(instance, :poll_limits),