diff options
author | Hakaba Hitoyo <hakabahitoyo@example.com> | 2018-11-15 14:04:09 +0900 |
---|---|---|
committer | Hakaba Hitoyo <hakabahitoyo@example.com> | 2018-11-15 14:04:09 +0900 |
commit | 5c8b8f6cb7212bd202924b535cd2a263416e78d4 (patch) | |
tree | 07ad2b2dd44189ae14a1ff44ff5a98013143866b /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
parent | 3484f687958f57ea5ce749135f78517ff12849d7 (diff) | |
parent | cc45797f4e1765f5123c058166f6032c6a6556a0 (diff) | |
download | pleroma-5c8b8f6cb7212bd202924b535cd2a263416e78d4.tar.gz |
Merge remote-tracking branch 'official/develop' into develop
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
-rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 59b0ce3e1..d58f08881 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -6,6 +6,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do alias Pleroma.{User, Repo} alias Pleroma.Web.ActivityPub.MRF + plug(Pleroma.Web.FederatingPlug) + def schemas(conn, _params) do response = %{ links: [ @@ -113,6 +115,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 } } |