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
This commit is contained in:
kaniini 2018-09-03 12:32:19 +00:00
commit 8fdddc255c

View File

@ -22,6 +22,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
instance = Application.get_env(:pleroma, :instance) instance = Application.get_env(:pleroma, :instance)
media_proxy = Application.get_env(:pleroma, :media_proxy) media_proxy = Application.get_env(:pleroma, :media_proxy)
suggestions = Application.get_env(:pleroma, :suggestions) suggestions = Application.get_env(:pleroma, :suggestions)
chat = Application.get_env(:pleroma, :chat)
gopher = Application.get_env(:pleroma, :gopher)
stats = Stats.get_stats() stats = Stats.get_stats()
response = %{ response = %{
@ -52,7 +54,9 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
thirdPartyEngine: Keyword.get(suggestions, :third_party_engine, ""), thirdPartyEngine: Keyword.get(suggestions, :third_party_engine, ""),
timeout: Keyword.get(suggestions, :timeout, 5000), timeout: Keyword.get(suggestions, :timeout, 5000),
web: Keyword.get(suggestions, :web, "") web: Keyword.get(suggestions, :web, "")
} },
chat: Keyword.get(chat, :enabled),
gopher: Keyword.get(gopher, :enabled)
} }
} }