ForceMentionsInContentTest: return mentions in a not terrible format

2 files changed, 29 insertions, 15 deletions

diff --git a/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex b/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
index a458bed31..1d750d4c2 100644
--- a/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
+++ b/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex
@@ -41,7 +41,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContent do
 
     mention_users =
       to
-      |> Enum.map(& {&1, User.get_cached_by_ap_id(&1)})
+      |> Enum.map(&{&1, User.get_cached_by_ap_id(&1)})
       |> Enum.reject(fn {_, user} -> is_nil(user) end)
       |> Enum.into(%{})
 
@@ -50,7 +50,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContent do
     added_mentions =
       Enum.reduce(mention_users, "", fn {uri, user}, acc ->
         unless uri in explicitly_mentioned_uris do
-          acc <> Formatter.mention_from_user(user)
+          acc <> Formatter.mention_from_user(user, %{mentions_format: :compact}) <> " "
         else
           acc
         end
@@ -58,7 +58,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContent do
 
     content =
       if added_mentions != "",
-        do: "<span class=\"recipients-inline\">#{added_mentions} </span>" <> content,
+        do: "<span class=\"recipients-inline\">#{added_mentions}</span>" <> content,
         else: content
 
     {:ok, put_in(object["object"]["content"], content)}
diff --git a/test/pleroma/web/activity_pub/mrf/force_mentions_in_content_test.exs b/test/pleroma/web/activity_pub/mrf/force_mentions_in_content_test.exs
index 090bdc35e..3c40887c4 100644
--- a/test/pleroma/web/activity_pub/mrf/force_mentions_in_content_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/force_mentions_in_content_test.exs
@@ -8,17 +8,29 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContentTest do
   use Pleroma.DataCase
 
   test "adds mentions to post content" do
-    users = %{
-      "lain@lain.com" => "https://lain.com/users/lain",
-      "coolboymew@shitposter.club" => "https://shitposter.club/users/coolboymew",
-      "dielan@shitposter.club" => "https://shitposter.club/users/dielan",
-      "hakui@tuusin.misono-ya.info" => "https://tuusin.misono-ya.info/users/hakui",
-      "fence@xyzzy.link" => "https://xyzzy.link/users/fence"
-    }
-
-    Enum.each(users, fn {nickname, ap_id} ->
-      insert(:user, ap_id: ap_id, nickname: nickname, local: false)
-    end)
+    [lain, coolboymew, dielan, hakui, fence] = [
+      insert(:user, ap_id: "https://lain.com/users/lain", nickname: "lain@lain.com", local: false),
+      insert(:user,
+        ap_id: "https://shitposter.club/users/coolboymew",
+        nickname: "coolboymew@shitposter.club",
+        local: false
+      ),
+      insert(:user,
+        ap_id: "https://shitposter.club/users/dielan",
+        nickname: "dielan@shitposter.club",
+        local: false
+      ),
+      insert(:user,
+        ap_id: "https://tuusin.misono-ya.info/users/hakui",
+        nickname: "hakui@tuusin.misono-ya.info",
+        local: false
+      ),
+      insert(:user,
+        ap_id: "https://xyzzy.link/users/fence",
+        nickname: "fence@xyzzy.link",
+        local: false
+      )
+    ]
 
     object = File.read!("test/fixtures/soapbox_no_mentions_in_content.json") |> Jason.decode!()
 
@@ -29,6 +41,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContentTest do
     }
 
     {:ok, %{"object" => %{"content" => filtered}}} = ForceMentionsInContent.filter(activity)
-    Enum.each(users, fn {nickname, _} -> assert filtered =~ nickname end)
+
+    assert filtered ==
+             "<span class=\"recipients-inline\"><span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{lain.id}\" href=\"https://lain.com/users/lain\" rel=\"ugc\">@<span>lain</span></a></span> <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{coolboymew.id}\" href=\"https://shitposter.club/users/coolboymew\" rel=\"ugc\">@<span>coolboymew</span></a></span> <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{dielan.id}\" href=\"https://shitposter.club/users/dielan\" rel=\"ugc\">@<span>dielan</span></a></span> <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{hakui.id}\" href=\"https://tuusin.misono-ya.info/users/hakui\" rel=\"ugc\">@<span>hakui</span></a></span> <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"#{fence.id}\" href=\"https://xyzzy.link/users/fence\" rel=\"ugc\">@<span>fence</span></a></span> </span><p>Haha yeah, you can control who you reply to.</p>"
   end
 end