marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'glitchsoc/master'

master
noiob 2019-05-22 02:39:52 +02:00
parent bb5bb43060 2332b3f146
commit d548d59223
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/formatter.rb
View File

@ -61,7 +61,9 @@ class Formatter
html = encode_and_link_urls(html, linkable_accounts, keep_html: %w(text/markdown text/html).include?(status.content_type))
html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
unless %w(text/markdown text/html).include?(status.content_type)
if %w(text/markdown text/html).include?(status.content_type)
html = reformat(html)
else
html = simple_format(html, {}, sanitize: false)
html = html.delete("\n")
end
@ -70,7 +72,7 @@ class Formatter
end
def format_markdown(html)
html = reformat(markdown_formatter.render(html))
html = markdown_formatter.render(html)
html.delete("\r").delete("\n")
end