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

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

diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index d95addb0b3361e4a9ed94f80f09555b9e29b81fe,9155e42cddf431b2ed5c5df9e5314c067d8b3b2e..67cef004a1fde647c2e46abf0c25a8acaa509ed4
--- 1/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
--- 2/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)
        }
      }