diff options
| author | Tristan Mahé <gled@remote-shell.net> | 2018-07-19 17:44:18 -0700 |
|---|---|---|
| committer | Tristan Mahé <gled@remote-shell.net> | 2018-07-19 17:44:18 -0700 |
| commit | bc2668bb63aee2c42cdea48782ba5ef291c17b45 (patch) | |
| tree | 838d334208c4dadf23b974181c0ad4c17b199f8c /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | 5469fb9561bb886deb8434e545dfb711eb20f341 (diff) | |
| parent | 41b0ecef959df0a1cda71e56e256cacebe48d56f (diff) | |
| download | pleroma-bc2668bb63aee2c42cdea48782ba5ef291c17b45.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 4 |
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) } } |