projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
9f0d0d0
)
Merge branch 'feature/nodeinfo-polls' into 'develop'
author
kaniini
<nenolod@gmail.com>
Tue, 4 Jun 2019 06:29:03 +0000
(06:29 +0000)
committer
kaniini
<nenolod@gmail.com>
Tue, 4 Jun 2019 06:29:03 +0000
(06:29 +0000)
nodeinfo: add pollLimits to metadata
See merge request pleroma/pleroma!1242
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 59f3d4e11613b47d33c95d17689ee1b5ec94edd9..57f5b61bb3706b480c2a7d22084daaa2228e601e 100644
(file)
--- 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]),