Merge branch 'main' into block-agenda-settings

app/models/communication/block.rb

@@ -39,6 +39,7 @@ class Communication::Block < ApplicationRecord
 
   IMAGE_MAX_SIZE = 5.megabytes
   FILE_MAX_SIZE = 100.megabytes
+  DEFAULT_HEADING_LEVEL = 2 # h1 is the page title
 
   belongs_to :about, polymorphic: true
   belongs_to :heading, optional: true
@@ -152,6 +153,11 @@ class Communication::Block < ApplicationRecord
     template.full_text
   end
 
+  def heading_level
+    heading.present?  ? heading.level + 1
+                      : DEFAULT_HEADING_LEVEL
+  end
+
   def to_s
     title.blank?  ? "#{Communication::Block.model_name.human} #{position}"
                   : "#{title}"

app/services/video/provider/youtube.rb

@@ -7,8 +7,8 @@ class Video::Provider::Youtube < Video::Provider::Default
   ]
 
   def identifier
-    video_url.include?('youtu.be')  ? identifier_path
-                                    : identifier_param
+    short_url?  ? param_from_short_url
+                : param_from_regular_url
   end
 
   def csp_domains
@@ -32,13 +32,20 @@ class Video::Provider::Youtube < Video::Provider::Default
 
   protected
 
-  def identifier_path
-    video_url.split('youtu.be/').last
+  def short_url?
+    video_url.include?('youtu.be')
   end
-
-  def identifier_param
+  
+  # youtube.com, www.youtube.com
+  def param_from_regular_url
     uri = URI(video_url)
     params = CGI::parse(uri.query)
     params['v'].first
   end
+
+  # youtu.be
+  def param_from_short_url
+    video_url.split('youtu.be/').last
+             .split('?').first
+  end
 end

app/views/admin/communication/blocks/_static.html.erb

@@ -7,6 +7,7 @@ should_render_data = block.data && block.data.present?
     title: >-
       <%= prepare_text_for_static block.title %>
     position: <%= block.position %>
+    heading_level: <%= block.heading_level %>
     data:
 <%= render  template_path, 
             block: block,