diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-29 20:14:10 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-29 20:14:10 +0000 |
| commit | a880e0a5278110031ad14bfd5c24e8054e878d9d (patch) | |
| tree | 52bb9c18fa65aaebf29442237967f39191a09f15 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 7ac701ccd211d0a1b04243e4c0591adb9f1996fc (diff) | |
| parent | 676c97b8c7c79c6f96fce1366fc79c73a251ec4f (diff) | |
| download | pleroma-a880e0a5278110031ad14bfd5c24e8054e878d9d.tar.gz | |
Merge branch 'feature/upload-limits' into 'develop'
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 59b0ce3e1..5446179cb 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -113,6 +113,12 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do staffAccounts: staff_accounts, federation: federation_response, postFormats: Keyword.get(instance, :allowed_post_formats), + uploadLimits: %{ + general: Keyword.get(instance, :upload_limit), + avatar: Keyword.get(instance, :avatar_upload_limit), + banner: Keyword.get(instance, :banner_upload_limit), + background: Keyword.get(instance, :background_upload_limit) + }, features: features } } |