hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge

Browse source
This commit is contained in:
Hakaba Hitoyo 2018-07-19 17:42:00 +09:00
commit cc9c062b55
16 changed files with 159 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
View file

@ -44,7 +44,9 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
},
metadata: %{
nodeName: Keyword.get(instance, :name),
nodeDescription: Keyword.get(instance, :description),
mediaProxy: Keyword.get(media_proxy, :enabled),
private: !Keyword.get(instance, :public, true),
suggestions: %{
enabled: Keyword.get(suggestions, :enabled, false),
thirdPartyEngine: Keyword.get(suggestions, :third_party_engine, ""),