pleroma

commit: 6db9f7cdb3adeda547b6e3e9ca887b685344351a
parent: 7c7a6509b92e335c42c36f6b4b414305e0c09f4b
Author: lain <lain@soykaf.club>
Date:   Fri, 26 Jun 2020 11:09:37 +0000

Merge branch 'fix-chats' into 'develop'

Nodeinfo: Add chat information back in.

See merge request pleroma/pleroma!2691
Diffstat:
M
lib/pleroma/web/nodeinfo/nodeinfo.ex
30
+-----------------------------
M
test/web/node_info_test.exs
3
++-

2 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo.ex b/lib/pleroma/web/nodeinfo/nodeinfo.ex
@@ -19,35 +19,7 @@ defmodule Pleroma.Web.Nodeinfo.Nodeinfo do
       |> Enum.map(fn u -> u.ap_id end)
 
     federation = InstanceView.federation()
-
-    features =
-      [
-        "pleroma_api",
-        "mastodon_api",
-        "mastodon_api_streaming",
-        "polls",
-        "pleroma_explicit_addressing",
-        "shareable_emoji_packs",
-        "multifetch",
-        "pleroma:api/v1/notifications:include_types_filter",
-        if Config.get([:media_proxy, :enabled]) do
-          "media_proxy"
-        end,
-        if Config.get([:gopher, :enabled]) do
-          "gopher"
-        end,
-        if Config.get([:chat, :enabled]) do
-          "chat"
-        end,
-        if Config.get([:instance, :allow_relay]) do
-          "relay"
-        end,
-        if Config.get([:instance, :safe_dm_mentions]) do
-          "safe_dm_mentions"
-        end,
-        "pleroma_emoji_reactions"
-      ]
-      |> Enum.filter(& &1)
+    features = InstanceView.features()
 
     %{
       version: "2.0",
diff --git a/test/web/node_info_test.exs b/test/web/node_info_test.exs
@@ -142,7 +142,8 @@ defmodule Pleroma.Web.NodeInfoTest do
       "shareable_emoji_packs",
       "multifetch",
       "pleroma_emoji_reactions",
-      "pleroma:api/v1/notifications:include_types_filter"
+      "pleroma:api/v1/notifications:include_types_filter",
+      "pleroma_chat_messages"
     ]
 
     assert MapSet.subset?(