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

[akkoma] / lib / pleroma / web / common_api / utils.ex

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index d80fffa26fcc762f17df12eb3e063eda4cb39382..6d42ae8ae133389b2d44257af2cbfe94b3350de8 100644 (file)
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -300,6 +300,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> 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(