X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..c5c344b12c6b538cce39b372079b051a6071c5b0:/lib/rich_text.rb?ds=inline diff --git a/lib/rich_text.rb b/lib/rich_text.rb index 87ea58933..a0c4d9c8d 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -1,15 +1,19 @@ module RichText + SPAMMY_PHRASES = [ + "Business Description:", "Additional Keywords:" + ].freeze + def self.new(format, text) case format - when "html"; HTML.new(text || "") - when "markdown"; Markdown.new(text || "") - when "text"; Text.new(text || "") - else; nil + when "html" then HTML.new(text || "") + when "markdown" then Markdown.new(text || "") + when "text" then Text.new(text || "") end end class SimpleFormat include ActionView::Helpers::TextHelper + include ActionView::Helpers::OutputSafetyHelper def sanitize(text) Sanitize.clean(text, Sanitize::Config::OSM).html_safe @@ -25,31 +29,41 @@ module RichText doc = Nokogiri::HTML(to_html) - if doc.content.length > 0 + if doc.content.empty? + link_proportion = 0 + else doc.xpath("//a").each do |link| link_count += 1 link_size += link.content.length end - link_proportion = link_size.to_f / doc.content.length.to_f - else - link_proportion = 0 + link_proportion = link_size.to_f / doc.content.length + end + + spammy_phrases = SPAMMY_PHRASES.count do |phrase| + doc.content.include?(phrase) end - return [link_proportion - 0.2, 0.0].max * 200 + link_count * 40 + ([link_proportion - 0.2, 0.0].max * 200) + + (link_count * 40) + + (spammy_phrases * 40) end - protected + protected def simple_format(text) 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 noreferrer")).html_safe else - Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")) + Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferrer")) end end end @@ -60,48 +74,17 @@ module RichText end def to_text - self.to_s - end - - private - - def sanitize(text) - Sanitize.clean(text, Sanitize::Config::OSM).html_safe + to_s end end class Markdown < Base def to_html - html_parser.render(self).html_safe + linkify(sanitize(Kramdown::Document.new(self).to_html), :all) end def to_text - self.to_s - end - - private - - def html_parser - @@html_renderer ||= Renderer.new({ - :filter_html => true, :safe_links_only => true - }) - @@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 + to_s end end @@ -111,7 +94,7 @@ module RichText end def to_text - self.to_s + to_s end end end