diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-04 06:29:03 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-04 06:29:03 +0000 |
| commit | 0f8f63c6bb4a26615277f43ed4f30f032d71df83 (patch) | |
| tree | 0d677477c2f234fea313ce8396251d83fb48b08f /lib | |
| parent | 9f0d0d0805d0417636c3cf7aaf14d15ad13d0148 (diff) | |
| parent | 1c6cf0a348661612070d32c6f4f5d980d9254ac0 (diff) | |
| download | pleroma-0f8f63c6bb4a26615277f43ed4f30f032d71df83.tar.gz | |
Merge branch 'feature/nodeinfo-polls' into 'develop'
nodeinfo: add pollLimits to metadata
See merge request pleroma/pleroma!1242
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 59f3d4e11..57f5b61bb 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -97,6 +97,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do "pleroma_api", "mastodon_api", "mastodon_api_streaming", + "polls", if Config.get([:media_proxy, :enabled]) do "media_proxy" end, @@ -149,6 +150,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do }, staffAccounts: staff_accounts, federation: federation_response, + pollLimits: Config.get([:instance, :poll_limits]), postFormats: Config.get([:instance, :allowed_post_formats]), uploadLimits: %{ general: Config.get([:instance, :upload_limit]), |