mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 00:26:30 +00:00
fix formatter
This commit is contained in:
parent
a50a47a011
commit
5d961d536c
3 changed files with 20 additions and 4 deletions
|
@ -91,6 +91,10 @@ defmodule Pleroma.Formatter 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
|
||||||
|
|
|
@ -186,9 +186,9 @@ defmodule Pleroma.Web.CommonAPI.Utils 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(
|
||||||
|
|
|
@ -104,6 +104,18 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest 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 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest 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")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue