Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

This reverts merge request !1504

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 6d42ae8ae133389b2d44257af2cbfe94b3350de8..d80fffa26fcc762f17df12eb3e063eda4cb39382 100644 (file)
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -300,9 +300,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Earmark.as_html!()
     |> Formatter.linkify(options)
     |> Formatter.html_escape("text/html")
     |> Earmark.as_html!()
     |> Formatter.linkify(options)
     |> Formatter.html_escape("text/html")

-    |> (fn {text, mentions, tags} ->
-          {String.replace(text, ~r/\r?\n/, ""), mentions, tags}
-        end).()

   end
 
   def make_note_data(
   end
 
   def make_note_data(

diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs
index 38b2319acb45b9238b8439e8790498f9837bd253..af320f31f3700929f9d1e51e27b153fb88f26a16 100644 (file)
--- a/test/web/common_api/common_api_utils_test.exs
+++ b/test/web/common_api/common_api_utils_test.exs
@@ -99,14 +99,14 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
 
     test "works for bare text/markdown" do
       text = "**hello world**"
 
     test "works for bare text/markdown" do
       text = "**hello world**"

-      expected = "<p><strong>hello world</strong></p>"
+      expected = "<p><strong>hello world</strong></p>\n"

 
       {output, [], []} = Utils.format_input(text, "text/markdown")
 
       assert output == expected
 
       text = "**hello world**\n\n*another paragraph*"
 
       {output, [], []} = Utils.format_input(text, "text/markdown")
 
       assert output == expected
 
       text = "**hello world**\n\n*another paragraph*"

-      expected = "<p><strong>hello world</strong></p><p><em>another paragraph</em></p>"
+      expected = "<p><strong>hello world</strong></p>\n<p><em>another paragraph</em></p>\n"

 
       {output, [], []} = Utils.format_input(text, "text/markdown")
 
 
       {output, [], []} = Utils.format_input(text, "text/markdown")
 


@@ -118,7 +118,7 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
       by someone
       """
 
       by someone
       """
 

-      expected = "<blockquote><p>cool quote</p></blockquote><p>by someone</p>"
+      expected = "<blockquote><p>cool quote</p>\n</blockquote>\n<p>by someone</p>\n"

 
       {output, [], []} = Utils.format_input(text, "text/markdown")
 
 
       {output, [], []} = Utils.format_input(text, "text/markdown")
 


@@ -157,11 +157,11 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
       text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*"
 
       expected =
       text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*"
 
       expected =

-        "<p><strong>hello world</strong></p><p><em>another <span class=\"h-card\"><a data-user=\"#{
+        "<p><strong>hello world</strong></p>\n<p><em>another <span class=\"h-card\"><a data-user=\"#{

           user.id
         }\" class=\"u-url mention\" href=\"http://foo.com/user__test\">@<span>user__test</span></a></span> and <span class=\"h-card\"><a data-user=\"#{
           user.id
           user.id
         }\" class=\"u-url mention\" href=\"http://foo.com/user__test\">@<span>user__test</span></a></span> and <span class=\"h-card\"><a data-user=\"#{
           user.id

-        }\" class=\"u-url mention\" href=\"http://foo.com/user__test\">@<span>user__test</span></a></span> <a href=\"http://google.com\">google.com</a> paragraph</em></p>"
+        }\" class=\"u-url mention\" href=\"http://foo.com/user__test\">@<span>user__test</span></a></span> <a href=\"http://google.com\">google.com</a> paragraph</em></p>\n"

 
       {output, _, _} = Utils.format_input(text, "text/markdown")
 
 
       {output, _, _} = Utils.format_input(text, "text/markdown")