Format announcements into html

2 files changed, 28 insertions, 0 deletions

diff --git a/test/pleroma/announcement_test.exs b/test/pleroma/announcement_test.exs
index aa00f804b..a007c3718 100644
--- a/test/pleroma/announcement_test.exs
+++ b/test/pleroma/announcement_test.exs
@@ -68,4 +68,31 @@ defmodule Pleroma.AnnouncementTest do
       assert [] = Announcement.list_all_visible_when(time)
     end
   end
+
+  describe "announcements formatting" do
+    test "it formats links" do
+      raw = "something on https://pleroma.social ."
+      announcement = insert(:announcement, %{data: %{"content" => raw}})
+
+      assert announcement.rendered["content"] =~ ~r(<a.+?https://pleroma.social)
+      assert announcement.data["content"] == raw
+    end
+
+    test "it formats mentions" do
+      user = insert(:user)
+      raw = "something on @#{user.nickname} ."
+      announcement = insert(:announcement, %{data: %{"content" => raw}})
+
+      assert announcement.rendered["content"] =~ ~r(<a.+?#{user.nickname})
+      assert announcement.data["content"] == raw
+    end
+
+    test "it formats tags" do
+      raw = "something on #mew ."
+      announcement = insert(:announcement, %{data: %{"content" => raw}})
+
+      assert announcement.rendered["content"] =~ ~r(<a.+?#mew)
+      assert announcement.data["content"] == raw
+    end
+  end
 end
diff --git a/test/support/factory.ex b/test/support/factory.ex
index d28a56345..efbf3df2e 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -637,5 +637,6 @@ defmodule Pleroma.Factory do
       data: Map.merge(%{"content" => "test announcement", "all_day" => false}, data)
     }
     |> Map.merge(params)
+    |> Pleroma.Announcement.add_rendered_properties()
   end
 end