Merge branch 'nodeinfo-federation-enabled' into 'develop'

report federating status in nodeinfo See merge request pleroma/pleroma!1971
2019-11-11 19:14:06 +00:00 · 2019-11-11 19:14:06 +00:00 · e27d78e768
commit e27d78e768
parent 2cc043591c b39b49cc14
2 changed files with 25 additions and 0 deletions
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@ -46,6 +46,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do

        data
        |> Map.merge(%{quarantined_instances: quarantined})
+        |> Map.put(:enabled, Config.get([:instance, :federating]))
      else
        %{}
      end