Merge branch 'feature/nodeinfo-polls' into 'develop'

nodeinfo: add pollLimits to metadata

See merge request pleroma/pleroma!1242
This commit is contained in:
kaniini 2019-06-04 06:29:03 +00:00
commit 0f8f63c6bb

View File

@ -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]),