mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix local text/html toots not being sanitized

pull/1064/head
Thibaut Girka 2019-05-21 22:57:59 +02:00 committed by ThibG
parent 4fbce23992
commit 2332b3f146
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