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

Merge branch 'fix/formatter' into 'develop' 

Bugfix: markdown in formatter

Closes #688

See merge request pleroma/pleroma!869
This commit is contained in:
kaniini 2019-02-27 08:45:43 +00:00
parent a50a47a011 5d961d536c
commit 14bc6bd40f
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/formatter.ex
View File

@ -91,6 +91,10 @@ def get_emoji(text) when is_binary(text) do
def get_emoji(_), do: [] def get_emoji(_), do: []
def html_escape({text, mentions, hashtags}, type) do
{html_escape(text, type), mentions, hashtags}
end
def html_escape(text, "text/html") do def html_escape(text, "text/html") do
HTML.filter_tags(text) HTML.filter_tags(text)
end end

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

@ -186,9 +186,9 @@ def format_input(text, "text/markdown", options) do
options = Keyword.put(options, :mentions_escape, true) options = Keyword.put(options, :mentions_escape, true)
text text
|> Formatter.html_escape("text/html")
|> Formatter.linkify(options) |> Formatter.linkify(options)
|> (fn {text, mentions, tags} -> {Earmark.as_html!(text), mentions, tags} end).() |> (fn {text, mentions, tags} -> {Earmark.as_html!(text), mentions, tags} end).()
|> Formatter.html_escape("text/html")
end end
def make_note_data( def make_note_data(

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

@ -104,6 +104,18 @@ test "works for bare text/markdown" do
{output, [], []} = Utils.format_input(text, "text/markdown") {output, [], []} = Utils.format_input(text, "text/markdown")
assert output == expected assert output == expected
text = """
> cool quote
by someone
"""
expected = "<blockquote><p>cool quote</p>\n</blockquote>\n<p>by someone</p>\n"
{output, [], []} = Utils.format_input(text, "text/markdown")
assert output == expected
end end
test "works for text/markdown with mentions" do test "works for text/markdown with mentions" do
@ -113,11 +125,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>\n<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>\n"
{output, _, _} = Utils.format_input(text, "text/markdown") {output, _, _} = Utils.format_input(text, "text/markdown")