X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/945ff7911ca51dc250ffaba71f62821b5c0c0a95..399ade116adb8250bbf92efa8dfeb3ca1090c7e4:/lib/rich_text.rb diff --git a/lib/rich_text.rb b/lib/rich_text.rb index 9e43ed29c..2b3e07d6a 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -1,4 +1,8 @@ module RichText + SPAMMY_PHRASES = [ + "Business Description:", "Additional Keywords:" + ].freeze + def self.new(format, text) case format when "html" then HTML.new(text || "") @@ -36,7 +40,13 @@ module RichText link_proportion = link_size.to_f / doc.content.length.to_f end - [link_proportion - 0.2, 0.0].max * 200 + link_count * 40 + spammy_phrases = SPAMMY_PHRASES.count do |phrase| + doc.content.include?(phrase) + end + + [link_proportion - 0.2, 0.0].max * 200 + + link_count * 40 + + spammy_phrases * 40 end protected @@ -45,11 +55,15 @@ module RichText SimpleFormat.new.simple_format(text) end - def linkify(text) + def sanitize(text) + Sanitize.clean(text, Sanitize::Config::OSM).html_safe + end + + def linkify(text, mode = :urls) if text.html_safe? - Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe + Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferer")).html_safe else - Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")) + Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferer")) end end end @@ -62,44 +76,16 @@ module RichText def to_text to_s end - - private - - def sanitize(text) - Sanitize.clean(text, Sanitize::Config::OSM).html_safe - end end class Markdown < Base def to_html - Markdown.html_parser.render(self).html_safe + linkify(sanitize(Kramdown::Document.new(self).to_html), :all) end def to_text to_s end - - def self.html_renderer - @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true) - end - - def self.html_parser - @html_parser ||= Redcarpet::Markdown.new(html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true) - end - - class Renderer < Redcarpet::Render::XHTML - def link(link, _title, alt_text) - "#{alt_text}" - end - - def autolink(link, link_type) - if link_type == :email - "#{link}" - else - "#{link}" - end - end - end end class Text < Base