summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2024-01-18 02:19:58 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2024-01-18 02:19:58 +0000
commit81a13b4b9eb066e7827251c054eb04fd70613532 (patch)
tree36c3cf30706ceeca00470e9d3281490707fbeb63 /lib
parent4c20713ecde9d429db937d3d66d4862bfb0456f5 (diff)
parentb39403a48fdb861b905bea16febba6d1660bb8df (diff)
downloadpleroma-81a13b4b9eb066e7827251c054eb04fd70613532.tar.gz
pleroma-81a13b4b9eb066e7827251c054eb04fd70613532.zip
Merge branch 'api-docs' into 'develop'
Update API docs for my changes See merge request pleroma/pleroma!4033
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/views/instance_view.ex2
1 files changed, 2 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 e514d0e91..7f73917d6 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -40,6 +40,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView 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),
+ chat_limit: Keyword.get(instance, :chat_limit),
pleroma: pleroma_configuration(instance)
})
end
@@ -222,6 +223,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
banner_upload_limit: Keyword.get(instance, :banner_upload_limit),
background_image:
Pleroma.Web.Endpoint.url() <> Keyword.get(instance, :background_image),
+ chat_limit: Keyword.get(instance, :chat_limit),
description_limit: Keyword.get(instance, :description_limit),
shout_limit: Config.get([:shout, :limit])
})