aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-05-15 17:47:29 +0200
committerlain <lain@soykaf.club>2019-05-15 17:47:29 +0200
commitf168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9 (patch)
tree3c208baf52e27859491cce07954ac9b1198cbc8f /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
parent786f2c7a849bc4fa2bd4aac18de59ef6b2ed18c5 (diff)
parent62516be9c462ca206163eaf7822f9ee5c2470453 (diff)
downloadpleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.tar.gz
Merge remote-tracking branch 'origin/develop' into conversations-import
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
-rw-r--r--lib/pleroma/web/nodeinfo/nodeinfo_controller.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 216a962bd..3bf2a0fbc 100644
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -10,6 +10,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
alias Pleroma.User
alias Pleroma.Web
alias Pleroma.Web.ActivityPub.MRF
+ alias Pleroma.Web.Federator.Publisher
plug(Pleroma.Web.FederatingPlug)
@@ -137,7 +138,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
name: Pleroma.Application.name() |> String.downcase(),
version: Pleroma.Application.version()
},
- protocols: ["ostatus", "activitypub"],
+ protocols: Publisher.gather_nodeinfo_protocol_names(),
services: %{
inbound: [],
outbound: []