aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-08-04 10:42:52 -0500
committerMark Felder <feld@feld.me>2021-06-01 11:49:46 -0500
commitd6432a65da7ad11f1383d465370c11de5a2d7ddc (patch)
tree10c977a0ca4d5e1f35d92df8ace756dadc1d07b5 /lib/pleroma/web/mastodon_api
parent4a181982c34c774c9ed4b76ce1d95f6c33fce9d5 (diff)
downloadpleroma-d6432a65da7ad11f1383d465370c11de5a2d7ddc.tar.gz
Move shout configuration from :instance, update docs and changelog
Diffstat (limited to 'lib/pleroma/web/mastodon_api')
-rw-r--r--lib/pleroma/web/mastodon_api/views/instance_view.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index 75964f176..fcb4e2466 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -37,7 +37,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
background_upload_limit: Keyword.get(instance, :background_upload_limit),
banner_upload_limit: Keyword.get(instance, :banner_upload_limit),
background_image: Pleroma.Web.Endpoint.url() <> Keyword.get(instance, :background_image),
- shout_limit: Keyword.get(instance, :shout_limit),
+ shout_limit: Config.get([:shout, :limit]),
description_limit: Keyword.get(instance, :description_limit),
pleroma: %{
metadata: %{