diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-03-22 17:56:49 +0100 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2020-03-24 12:07:47 +0100 |
commit | 02f1c04fabab221130de8dfb5611be81825b193b (patch) | |
tree | c54df9c99e6d2e4e2b4f384362ff9a28002b064d /app/lib/formatter.rb | |
parent | 2c510ee00a9fb4141a428d9a21dbd561171b3409 (diff) |
Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”
Diffstat (limited to 'app/lib/formatter.rb')
-rw-r--r-- | app/lib/formatter.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index b7a0286d2..051f27408 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -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 |