X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6f9b0c2f6b187a1787e195cd0d768c5fca1cd839..3dc76a9bc0383d9bc5316603cad02bf6857a181d:/lib/rich_text.rb?ds=sidebyside diff --git a/lib/rich_text.rb b/lib/rich_text.rb index 1de7b882b..f19d3d3a9 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -15,7 +15,7 @@ module RichText include ActionView::Helpers::TextHelper include ActionView::Helpers::OutputSafetyHelper - def sanitize(text) + def sanitize(text, _options = {}) Sanitize.clean(text, Sanitize::Config::OSM).html_safe end end @@ -44,9 +44,13 @@ module RichText doc.content.include?(phrase) end - [link_proportion - 0.2, 0.0].max * 200 + - link_count * 40 + - spammy_phrases * 40 + ([link_proportion - 0.2, 0.0].max * 200) + + (link_count * 40) + + (spammy_phrases * 40) + end + + def image + nil end protected @@ -61,9 +65,9 @@ module RichText def linkify(text, mode = :urls) if text.html_safe? - Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferer")).html_safe + Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferrer")).html_safe else - Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferer")) + Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferrer")) end end end @@ -80,12 +84,33 @@ module RichText class Markdown < Base def to_html - linkify(sanitize(Kramdown::Document.new(self).to_html), :all) + linkify(sanitize(document.to_html), :all) end def to_text to_s end + + def image + return @image if defined? @image + + @image = first_image_element(document.root)&.attr&.[]("src") + end + + private + + def document + @document ||= Kramdown::Document.new(self) + end + + def first_image_element(element) + return element if element.type == :img + + element.children.find do |child| + nested_image = first_image_element(child) + break nested_image if nested_image + end + end end class Text < Base