aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-07-29 12:43:39 -0500
committerAlex Gleason <alex@alexgleason.me>2020-07-29 12:43:39 -0500
commitd8a01c94321e90832fea5a26fbb2a2f5be1c5ba5 (patch)
tree43a18b75775223594f58860098e231068000b0d4 /lib/pleroma/web/mastodon_api
parent3b7c454418700ca36c0a71272f913ea8c6e464e9 (diff)
parenta6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff)
downloadpleroma-d8a01c94321e90832fea5a26fbb2a2f5be1c5ba5.tar.gz
Merge remote-tracking branch 'upstream/develop' into hide-reactions
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),