From: kaniini <nenolod@gmail.com>
Date: Mon, 3 Sep 2018 14:55:42 +0000 (+0000)
Subject: Merge branch 'develop' into 'feature/staff-discovery-api'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=76c67a41c12a80138e984fa782d7396da53b8d32;p=akkoma

Merge branch 'develop' into 'feature/staff-discovery-api'

# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
---

76c67a41c12a80138e984fa782d7396da53b8d32
diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index d95addb0b,9155e42cd..67cef004a
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@@ -23,13 -22,10 +23,15 @@@ defmodule Pleroma.Web.Nodeinfo.Nodeinfo
      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()
  
 +    staff_accounts =
 +      User.moderator_user_query()
 +      |> Repo.all()
 +      |> Enum.map(fn u -> u.ap_id end)
 +
      response = %{
        version: "2.0",
        software: %{
@@@ -59,7 -55,8 +61,9 @@@
            timeout: Keyword.get(suggestions, :timeout, 5000),
            web: Keyword.get(suggestions, :web, "")
          },
-         staffAccounts: staff_accounts
++        staffAccounts: staff_accounts,
+         chat: Keyword.get(chat, :enabled),
+         gopher: Keyword.get(gopher, :enabled)
        }
      }