hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix formatter

Browse source
This commit is contained in:
Egor Kislitsyn 2019-02-27 15:40:30 +07:00
commit 5d961d536c
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/formatter.ex
View file

@ -91,6 +91,10 @@ defmodule Pleroma.Formatter 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
HTML.filter_tags(text)
end

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

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