Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions

diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 30838b1eb76d467845144f1437c49a42eb38a6ea..f9a5ddcc00e79814e5931289bb5ac8615acca3ac 100644 (file)
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -75,7 +75,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
         end,
         if Config.get([:instance, :safe_dm_mentions]) do
           "safe_dm_mentions"
-        end
+        end,
+        "pleroma_emoji_reactions"
       ]
       |> Enum.filter(& &1)
 

diff --git a/test/web/node_info_test.exs b/test/web/node_info_test.exs
index 43f32260616e9fcca5a481f765a3526e88369806..01a67afd7ca37e425de28a05d1aced37326f2e83 100644 (file)
--- a/test/web/node_info_test.exs
+++ b/test/web/node_info_test.exs
@@ -128,6 +128,27 @@ defmodule Pleroma.Web.NodeInfoTest do
     end
   end
 
+  test "it shows default features flags", %{conn: conn} do
+    response =
+      conn
+      |> get("/nodeinfo/2.1.json")
+      |> json_response(:ok)
+
+    assert response["metadata"]["features"] --
+             [
+               "pleroma_api",
+               "mastodon_api",
+               "mastodon_api_streaming",
+               "polls",
+               "pleroma_explicit_addressing",
+               "shareable_emoji_packs",
+               "multifetch",
+               "chat",
+               "relay",
+               "pleroma_emoji_reactions"
+             ] == []
+  end
+
   test "it shows MRF transparency data if enabled", %{conn: conn} do
     config = Pleroma.Config.get([:instance, :rewrite_policy])
     Pleroma.Config.put([:instance, :rewrite_policy], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])