aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-19 07:31:10 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-19 07:31:10 +0000
commit6f23fb53d36f93ffd0c8776778de4caf9dd80036 (patch)
treecbcfba6209c9a300b4e64930dba4e1500f542407 /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
parentb7001ea9e72947596b60e080768be10b4cbae82b (diff)
parent2b3f049b06aa2d248028890bd8fdfbeb9e1e279e (diff)
downloadpleroma-6f23fb53d36f93ffd0c8776778de4caf9dd80036.tar.gz
Merge branch 'feature/fe-configuration' into 'develop'
serverside frontend configuration See merge request pleroma/pleroma!256
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
-rw-r--r--lib/pleroma/web/nodeinfo/nodeinfo_controller.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 12aca4a10..7c67bbf1c 100644
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -43,7 +43,9 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
},
metadata: %{
nodeName: Keyword.get(instance, :name),
- mediaProxy: Keyword.get(media_proxy, :enabled)
+ nodeDescription: Keyword.get(instance, :description),
+ mediaProxy: Keyword.get(media_proxy, :enabled),
+ private: !Keyword.get(instance, :public, true)
}
}