commit: 8fdddc255ce4fea3060904d27634022718597133
parent: 7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14
Author: kaniini <nenolod@gmail.com>
Date: Mon, 3 Sep 2018 12:32:19 +0000
Merge branch 'report-chat-and-gopher-support' into 'develop'
Report chat and gopher support at /nodeinfo/2.0.json
See merge request pleroma/pleroma!327
Diffstat:
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -22,6 +22,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
instance = Application.get_env(:pleroma, :instance)
media_proxy = Application.get_env(:pleroma, :media_proxy)
suggestions = Application.get_env(:pleroma, :suggestions)
+ chat = Application.get_env(:pleroma, :chat)
+ gopher = Application.get_env(:pleroma, :gopher)
stats = Stats.get_stats()
response = %{
@@ -52,7 +54,9 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
thirdPartyEngine: Keyword.get(suggestions, :third_party_engine, ""),
timeout: Keyword.get(suggestions, :timeout, 5000),
web: Keyword.get(suggestions, :web, "")
- }
+ },
+ chat: Keyword.get(chat, :enabled),
+ gopher: Keyword.get(gopher, :enabled)
}
}