diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-03 12:32:19 +0000 | 
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-03 12:32:19 +0000 | 
| commit | 8fdddc255ce4fea3060904d27634022718597133 (patch) | |
| tree | 2c9cdfc7ffacee1f92529d7b8c6804d2f0212051 | |
| parent | 7ca2a2ddeaa4396c86cd39a43a8fd0a4c8d3ce14 (diff) | |
| parent | b1124f1605717ec841d3693745536e49bdadd8c5 (diff) | |
| download | pleroma-8fdddc255ce4fea3060904d27634022718597133.tar.gz pleroma-8fdddc255ce4fea3060904d27634022718597133.zip | |
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
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 6 | 
1 files changed, 5 insertions, 1 deletions
| diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 2fab60274..9155e42cd 100644 --- 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)        }      } | 
