summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/views/instance_view.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2022-02-09 11:14:30 -0600
committerAlex Gleason <alex@alexgleason.me>2022-02-09 11:14:30 -0600
commitc735444f3803a8cff15c1a4aaee82b821ef27441 (patch)
tree506fb60d08c6daa1dd73384eb31a919d9fcd2f65 /lib/pleroma/web/mastodon_api/views/instance_view.ex
parent11f03344d385de78e79e35ccfe8c980f9f6e32b3 (diff)
parentfa8e2ffa3f493d5b2911507b0ac06094615e9d8f (diff)
Merge remote-tracking branch 'origin/develop' into operation-warpsneedoperation-warpsneed
Diffstat (limited to 'lib/pleroma/web/mastodon_api/views/instance_view.ex')
-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 fa6c20a30..23770f671 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -31,6 +31,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
approval_required: Keyword.get(instance, :account_approval_required),
# Extra (not present in Mastodon):
max_toot_chars: Keyword.get(instance, :limit),
+ max_media_attachments: Keyword.get(instance, :max_media_attachments),
poll_limits: Keyword.get(instance, :poll_limits),
upload_limit: Keyword.get(instance, :upload_limit),
avatar_upload_limit: Keyword.get(instance, :avatar_upload_limit),