|
|
|
@ -59,7 +59,7 @@ class Formatter
|
|
|
|
|
html = "RT @#{prepend_reblog} #{html}" if prepend_reblog
|
|
|
|
|
html = format_markdown(html) if status.content_type == 'text/markdown'
|
|
|
|
|
html = encode_and_link_urls(html, linkable_accounts, keep_html: %w(text/markdown text/html).include?(status.content_type))
|
|
|
|
|
html = reformat(html) if %w(text/markdown text/html).include?(status.content_type)
|
|
|
|
|
html = reformat(html, true) if %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)
|
|
|
|
@ -75,8 +75,8 @@ class Formatter
|
|
|
|
|
html.delete("\r").delete("\n")
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def reformat(html)
|
|
|
|
|
sanitize(html, Sanitize::Config::MASTODON_STRICT)
|
|
|
|
|
def reformat(html, outgoing = false)
|
|
|
|
|
sanitize(html, Sanitize::Config::MASTODON_STRICT.merge(outgoing: outgoing))
|
|
|
|
|
rescue ArgumentError
|
|
|
|
|
''
|
|
|
|
|
end
|
|
|
|
|