Merge remote-tracking branch 'pleroma/develop' into cycles-base-url

This commit is contained in:
Alex Gleason 2021-05-31 16:49:46 -05:00
commit f2134e605b
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
186 changed files with 5816 additions and 1315 deletions

View file

@ -121,6 +121,10 @@ defmodule Pleroma.Formatter do
end
end
def markdown_to_html(text) do
Earmark.as_html!(text, %Earmark.Options{compact_output: true})
end
def html_escape({text, mentions, hashtags}, type) do
{html_escape(text, type), mentions, hashtags}
end