logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 0f8f63c6bb4a26615277f43ed4f30f032d71df83
parent: 9f0d0d0805d0417636c3cf7aaf14d15ad13d0148
Author: kaniini <nenolod@gmail.com>
Date:   Tue,  4 Jun 2019 06:29:03 +0000

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

nodeinfo: add pollLimits to metadata

See merge request pleroma/pleroma!1242

Diffstat:

Mlib/pleroma/web/nodeinfo/nodeinfo_controller.ex2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git 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]),