X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..f70edc02f086d97727453e738e9f0083c68ec706:/lib/rich_text.rb
diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 9e43ed29c..d0539b2b0 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
@@ -47,9 +57,9 @@ module RichText
def linkify(text)
if text.html_safe?
- Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
+ Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
else
- Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
+ Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow"))
end
end
end
@@ -80,26 +90,12 @@ module RichText
end
def self.html_renderer
- @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true)
+ @html_renderer ||= Redcarpet::Render::XHTML.new(:filter_html => true, :safe_links_only => true, :link_attributes => { :rel => "nofollow" })
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