Merge remote-tracking branch 'upstream/pull/5000'

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index a0c4d9c8debc70fb3a39c6a32d7ffecf7b9aa867..f19d3d3a952ddd2c8240e2ea8da228c434523ffc 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -15,7 +15,7 @@ module RichText
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::OutputSafetyHelper
 
     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
       Sanitize.clean(text, Sanitize::Config::OSM).html_safe
     end
   end


@@ -49,6 +49,10 @@ module RichText
         (spammy_phrases * 40)
     end
 
         (spammy_phrases * 40)
     end
 

+    def image
+      nil
+    end
+

     protected
 
     def simple_format(text)
     protected
 
     def simple_format(text)


@@ -80,12 +84,33 @@ module RichText
 
   class Markdown < Base
     def to_html
 
   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
     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
   end
 
   class Text < Base