alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

markdown: clean up html generated by earmark

See merge request pleroma/pleroma!1504
This commit is contained in:
Haelwenn 2019-07-29 19:24:14 +00:00
parent 1dfde4151c 5795a890e9
commit 83508418fb
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/common_api/utils.ex
View File

@ -300,6 +300,9 @@ def format_input(text, "text/markdown", options) do
|> Earmark.as_html!() |> Earmark.as_html!()
|> Formatter.linkify(options) |> Formatter.linkify(options)
|> Formatter.html_escape("text/html") |> Formatter.html_escape("text/html")
|> (fn {text, mentions, tags} ->
{String.replace(text, ~r/\r?\n/, ""), mentions, tags}
end).()
end end
def make_note_data( def make_note_data(

10
test/web/common_api/common_api_utils_test.exs
View File

@ -99,14 +99,14 @@ test "works for bare text/html" do
test "works for bare text/markdown" do test "works for bare text/markdown" do
text = "**hello world**" text = "**hello world**"
expected = "<p><strong>hello world</strong></p>\n" expected = "<p><strong>hello world</strong></p>"
{output, [], []} = Utils.format_input(text, "text/markdown") {output, [], []} = Utils.format_input(text, "text/markdown")
assert output == expected assert output == expected
text = "**hello world**\n\n*another paragraph*" text = "**hello world**\n\n*another paragraph*"
expected = "<p><strong>hello world</strong></p>\n<p><em>another paragraph</em></p>\n" expected = "<p><strong>hello world</strong></p><p><em>another paragraph</em></p>"
{output, [], []} = Utils.format_input(text, "text/markdown") {output, [], []} = Utils.format_input(text, "text/markdown")
@ -118,7 +118,7 @@ test "works for bare text/markdown" do
by someone by someone
""" """
expected = "<blockquote><p>cool quote</p>\n</blockquote>\n<p>by someone</p>\n" expected = "<blockquote><p>cool quote</p></blockquote><p>by someone</p>"
{output, [], []} = Utils.format_input(text, "text/markdown") {output, [], []} = Utils.format_input(text, "text/markdown")
@ -157,11 +157,11 @@ test "works for text/markdown with mentions" do
text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*" text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*"
expected = expected =
"<p><strong>hello world</strong></p>\n<p><em>another <span class=\"h-card\"><a data-user=\"#{ "<p><strong>hello world</strong></p><p><em>another <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=\"#{ }\" 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> <a href=\"http://google.com\">google.com</a> paragraph</em></p>\n" }\" 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>"
{output, _, _} = Utils.format_input(text, "text/markdown") {output, _, _} = Utils.format_input(text, "text/markdown")