sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fix/nodeinfo-nil-features' into 'develop' 

Nodeinfo: remove null features; relay feature.

See merge request pleroma/pleroma!520
This commit is contained in:
lambda 2018-12-08 09:12:06 +00:00
parent 8fa5c66eab 134cc94cbd
commit beadeaffa1
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
View File

@ -71,23 +71,28 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
%{}
end
features = [
"pleroma_api",
"mastodon_api",
"mastodon_api_streaming",
if Keyword.get(media_proxy, :enabled) do
"media_proxy"
end,
if Keyword.get(gopher, :enabled) do
"gopher"
end,
if Keyword.get(chat, :enabled) do
"chat"
end,
if Keyword.get(suggestions, :enabled) do
"suggestions"
end
]
features =
[
"pleroma_api",
"mastodon_api",
"mastodon_api_streaming",
if Keyword.get(media_proxy, :enabled) do
"media_proxy"
end,
if Keyword.get(gopher, :enabled) do
"gopher"
end,
if Keyword.get(chat, :enabled) do
"chat"
end,
if Keyword.get(suggestions, :enabled) do
"suggestions"
end,
if Keyword.get(instance, :allow_relay) do
"relay"
end
]
|> Enum.filter(& &1)
response = %{
version: "2.0",