From 3b8bf8464f0d9948383ab2e21b870265aa6f8422 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Wed, 20 Jul 2022 15:43:41 +0100
Subject: [PATCH 1/2] update features array

---
 lib/pleroma/web/mastodon_api/views/instance_view.ex | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index c36271654..d67f100a6 100644
--- a/lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex
@@ -57,6 +57,7 @@ def render("show.json", _) do
   def features do
     [
       "pleroma_api",
+      "akkoma_api",
       "mastodon_api",
       "mastodon_api_streaming",
       "polls",
@@ -68,13 +69,6 @@ def features do
       if Config.get([:media_proxy, :enabled]) do
         "media_proxy"
       end,
-      # backwards compat
-      if Config.get([:shout, :enabled]) do
-        "chat"
-      end,
-      if Config.get([:shout, :enabled]) do
-        "shout"
-      end,
       if Config.get([:instance, :allow_relay]) do
         "relay"
       end,
@@ -82,7 +76,6 @@ def features do
         "safe_dm_mentions"
       end,
       "pleroma_emoji_reactions",
-      "pleroma_chat_messages",
       if Config.get([:instance, :show_reactions]) do
         "exposable_reactions"
       end,

From e35dced9c899ffa6d64bc94d6993a33c040988ed Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Wed, 20 Jul 2022 15:46:41 +0100
Subject: [PATCH 2/2] remove chat enabled feature

---
 test/pleroma/web/node_info_test.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/pleroma/web/node_info_test.exs b/test/pleroma/web/node_info_test.exs
index 9deceb1b5..6eb0a585a 100644
--- a/test/pleroma/web/node_info_test.exs
+++ b/test/pleroma/web/node_info_test.exs
@@ -133,6 +133,7 @@ test "it shows default features flags", %{conn: conn} do
 
     default_features = [
       "pleroma_api",
+      "akkoma_api",
       "mastodon_api",
       "mastodon_api_streaming",
       "polls",
@@ -140,8 +141,7 @@ test "it shows default features flags", %{conn: conn} do
       "shareable_emoji_packs",
       "multifetch",
       "pleroma_emoji_reactions",
-      "pleroma:api/v1/notifications:include_types_filter",
-      "pleroma_chat_messages"
+      "pleroma:api/v1/notifications:include_types_filter"
     ]
 
     assert MapSet.subset?(