Remove Pleroma.Formatter.minify/2

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 2aa236ca9e7220a2cfcccb549f4dde5eafe19f49..baf652a5a4283b091f3995e7ca11c53655e1039a 100644 (file)
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -142,17 +142,6 @@ defmodule Pleroma.Formatter do
     |> Enum.join("")
   end
 
-  def minify({text, mentions, hashtags}, type) do
-    {minify(text, type), mentions, hashtags}
-  end
-
-  def minify(text, "text/html") do
-    text
-    |> String.replace(">\n", ">")
-    |> String.replace(">  ", ">")
-    |> String.replace("  <", "<")
-  end
-
   def truncate(text, max_length \\ 200, omission \\ "...") do
     # Remove trailing whitespace
     text = Regex.replace(~r/([^ \t\r\n])([ \t]+$)/u, text, "\\g{1}")

diff --git a/lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex b/lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
index fa3e2c0267b1987f8504ec6b2282a5b9e53a88c9..9b38aa4c244f8f2fc7d6175f8becb9c5044fc513 100644 (file)
--- a/lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
+++ b/lib/pleroma/web/activity_pub/object_validators/audio_video_validator.ex
@@ -96,7 +96,6 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AudioVideoValidator do
     content =
       content
       |> Pleroma.Formatter.markdown_to_html()
-      |> Pleroma.Formatter.minify("text/html")
       |> Pleroma.HTML.filter_tags()
 
     Map.put(data, "content", content)

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index be86009af1d3f82c22b09f7619e37bacca021d53..4731e79beffdfc8f815346d4cb1214784dfd1a19 100644 (file)
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -296,7 +296,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Formatter.mentions_escape(options)
     |> Formatter.markdown_to_html()
     |> Formatter.linkify(options)
-    |> Formatter.minify("text/html")
     |> Formatter.html_escape("text/html")
   end
 

diff --git a/test/pleroma/formatter_test.exs b/test/pleroma/formatter_test.exs
index ceedd1b6df298d960d6544696e03be33179b7b21..5781a3f01d951b9d42b396d0c43ee71d8876313d 100644 (file)
--- a/test/pleroma/formatter_test.exs
+++ b/test/pleroma/formatter_test.exs
@@ -307,11 +307,4 @@ defmodule Pleroma.FormatterTest do
 
     assert Formatter.html_escape(text, "text/plain") == expected
   end
-
-  test "it minifies html" do
-    text = "<p>\nhello</p>\n<p>\nworld</p>\n"
-    expected = "<p>hello</p><p>world</p>"
-
-    assert Formatter.minify(text, "text/html") == expected
-  end
 end