From afad1eb85a926434343bd0efd1e050ecc0272224 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Sat, 26 Nov 2022 13:18:04 +0000
Subject: [PATCH 01/11] Add support for Daily Motion videos

---
 better-core-video-embeds.php | 66 ++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
index 84cb683..142defd 100644
--- a/better-core-video-embeds.php
+++ b/better-core-video-embeds.php
@@ -151,6 +151,23 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 
 			// break out the switch.
 			break;
+		
+		// for vimeo urls.
+		case 'www.dailymotion.com';
+
+			// if we have a path.
+			if ( empty( $parsed_video_url['path'] ) ) {
+				return $block_content;
+			}
+
+			// remove the preceeding slash.
+			$video_id = str_replace( '/video/', '', $parsed_video_url['path'] );
+
+			// get the vimeo thumbnail url for this video.
+			$thumbnail_url = hd_bcve_get_dailymotion_video_thumbnail_url( $video_id );
+			
+			// break out the switch.
+			break;
 
 	}
 
@@ -309,6 +326,55 @@ function hd_bcve_get_vimeo_video_thumbnail_url( $video_id = '' ) {
 
 }
 
+/**
+ * Return the dailymotion video thumbnail url.
+ *
+ * @param string  $video_id The ID of the video.
+ * @return string $url      The URL of the thumbnail or an empty string if no URL found.
+ */
+function hd_bcve_get_dailymotion_video_thumbnail_url( $video_id = '' ) {
+
+	// if we have no video id.
+	if ( '' === $video_id ) {
+		return '';
+	}
+
+	// get the URL from the transient.
+	$image_url = get_transient( 'hd_bcve_' . $video_id );
+
+	// if we don't have a transient.
+	if ( false === $image_url ) {
+
+		// get the video details from the api.
+		$video_details = wp_remote_get(
+			'https://api.dailymotion.com/video/' . $video_id . '?fields=thumbnail_url'
+		);
+
+		// if the request to the hi res image errors or returns anything other than a http 200 response code.
+		if ( ( is_wp_error( $video_details )) && ( 200 !== wp_remote_retrieve_response_code( $video_details ) ) ) {
+			return '';
+		}
+
+		// grab the body of the response.
+		$video_details = json_decode(
+			wp_remote_retrieve_body(
+				$video_details
+			)
+		);
+
+		// get the image url from the json.
+		$image_url = $video_details->thumbnail_url;
+
+		// set the transient, storing the image url.
+		set_transient( 'hd_bcve_' . $video_id, $image_url, DAY_IN_SECONDS );
+
+	}
+	
+	// return the url.
+	return apply_filters( 'hd_bcve_vimeo_video_thumbnail_url', $image_url, $video_id );
+
+}
+
 /**
  * Creates a escaping function to allowed certain HTML for embed content.
  * Needed for when echoing the innerblock HTML.

From f039d5fc219d058354bf01764370adc8e0554081 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Mon, 28 Nov 2022 18:44:10 +0000
Subject: [PATCH 02/11] Register styles on wp rather than wp_head hook

---
 better-core-video-embeds.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
index 84cb683..c7dfcce 100644
--- a/better-core-video-embeds.php
+++ b/better-core-video-embeds.php
@@ -64,7 +64,7 @@ function hd_bcve_register_block_style() {
 
 }
 
-add_action( 'wp_head', 'hd_bcve_register_block_style' );
+add_action( 'wp', 'hd_bcve_register_block_style' );
 
 /**
  * Filters the code embed block output for improved performance on Youtube videos.

From 4ff4cd6405125d483a7e7ff4293623ccb85b06f6 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Mon, 28 Nov 2022 18:59:21 +0000
Subject: [PATCH 03/11] Update CSS to give image max width

---
 assets/css/better-core-video-embeds.css     | 1 +
 assets/css/better-core-video-embeds.min.css | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/css/better-core-video-embeds.css b/assets/css/better-core-video-embeds.css
index 42b68c2..ada4d9c 100644
--- a/assets/css/better-core-video-embeds.css
+++ b/assets/css/better-core-video-embeds.css
@@ -5,6 +5,7 @@
 .hd-bcve-thumbnail {
 	height: auto;
 	max-width: 100%;
+	width: 100%;
 }
 .hd-bcve-wrapper .play-button {
     --hd-play-button-size: 80px;
diff --git a/assets/css/better-core-video-embeds.min.css b/assets/css/better-core-video-embeds.min.css
index ff29fff..e5e1b2c 100644
--- a/assets/css/better-core-video-embeds.min.css
+++ b/assets/css/better-core-video-embeds.min.css
@@ -1 +1 @@
-.hd-bcve-wrapper{position:relative;cursor:pointer}.hd-bcve-thumbnail{height:auto;max-width:100%}.hd-bcve-wrapper .play-button{--hd-play-button-size:80px;--hd-play-button-background-color:#FFFFFF;display:flex;align-items:center;justify-content:center;position:absolute;top:calc(50% - 0.5 * var(--hd-play-button-size));left:calc(50% - 0.5 * var(--hd-play-button-size));z-index:2;width:var(--hd-play-button-size);height:var(--hd-play-button-size)}.hd-bcve-wrapper .play-button:after{--hd-play-button-opacity:0.8;content:'';display:block;width:0;height:0;border-style:solid;border-width:37.5px 0 37.5px 65.0px;border-color:transparent transparent transparent var(--hd-play-button-background-color);opacity:var(--hd-play-button-opacity);transition:all 0.2s linear}.hd-bcve-wrapper:hover .play-button:after{--hd-play-button-opacity:1}
\ No newline at end of file
+.hd-bcve-wrapper{position:relative;cursor:pointer}.hd-bcve-thumbnail{height:auto;max-width:100%;width:100%}.hd-bcve-wrapper .play-button{--hd-play-button-size:80px;--hd-play-button-background-color:#FFFFFF;display:flex;align-items:center;justify-content:center;position:absolute;top:calc(50% - 0.5 * var(--hd-play-button-size));left:calc(50% - 0.5 * var(--hd-play-button-size));z-index:2;width:var(--hd-play-button-size);height:var(--hd-play-button-size)}.hd-bcve-wrapper .play-button:after{--hd-play-button-opacity:0.8;content:'';display:block;width:0;height:0;border-style:solid;border-width:37.5px 0 37.5px 65.0px;border-color:transparent transparent transparent var(--hd-play-button-background-color);opacity:var(--hd-play-button-opacity);transition:all 0.2s linear}.hd-bcve-wrapper:hover .play-button:after{--hd-play-button-opacity:1}
\ No newline at end of file

From 56ebc97bd329facc5000b98339c72e337a8c940d Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Mon, 28 Nov 2022 21:22:10 +0000
Subject: [PATCH 04/11] Add caption support

---
 assets/js/better-core-video-embeds.js | 36 +++++++++++++++++++--------
 better-core-video-embeds.php          |  4 +--
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/assets/js/better-core-video-embeds.js b/assets/js/better-core-video-embeds.js
index eedd0fd..eeb36b6 100644
--- a/assets/js/better-core-video-embeds.js
+++ b/assets/js/better-core-video-embeds.js
@@ -2,31 +2,47 @@
 // these are the elements that should contain the thumbnail.
 document.querySelectorAll( '.hd-bcve-wrapper' ).forEach(( el, i ) => {
 
-	// when the wrapper is clicked.
-	el.addEventListener( 'click', () => {
+	// get the youtube video id for the data attribute on the wrapper.
+	var videoId = el.getAttribute( 'data-id' );
+
+	// get the associated template element which holds the embed code.
+	var template = document.querySelector( '#hd-bcve-embed-html-' + videoId );
+	var caption = template.content.textContent;
+	caption = caption.trim();
+
+	// if we have a caption.
+	if ( '' !== caption ) {
 
-		// get the youtube video id for the data attribute on the wrapper.
-		var videoId = el.getAttribute( 'data-id' );
+		// create an element for the embed caption.
+		var captionEl = document.createElement('figcaption');
+		captionEl.classList.add( 'wp-element-caption' );
+		captionEl.textContent = caption;
+	
+		// add the caption, after the thumbnail.
+		el.append( captionEl );
 
-		// get the associated template element which holds the embed code.
-		var template = document.querySelector( '#hd-bcve-embed-html-' + videoId );
+	}
+
+	// when the wrapper is clicked.
+	el.addEventListener( 'click', () => {
 
 		// clone the template element.
 		var contentOuter = template.content.cloneNode( true );
 
 		// grab just the first child of the template - this is the figure block element which wraps the iframe.
-		var content =contentOuter.children[0]
+		var content = contentOuter.children[0];
 
 		// find the iframe in the embed content.
 		var iframe = content.querySelector( 'iframe' );
 
 		// add auto play true to the iframe src.
 		// ensures the video plays when the thumbnail is clicked.
-		var iframeSrc = iframe.getAttribute( 'src' ) + '&autoplay=true&rel=0&showinfo=0';
-		var iframeSrcNew = iframeSrc.replace( 'www.youtube.com', 'www.youtube-nocookie.com' );
+		var iframeSrc = iframe.getAttribute( 'src' ) + '&rel=0&showinfo=0&autoplay=1';
+		iframeSrc = iframeSrc.replace( 'www.youtube.com', 'www.youtube-nocookie.com' );
+		console.log( iframeSrc );
 		
 		// set the new iframe src including autoplay true.
-		iframe.setAttribute( 'src', iframeSrcNew );
+		iframe.setAttribute( 'src', iframeSrc );
 		
 
 		// add the iframe embed content before the embed wrapper.
diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
index c7dfcce..213913e 100644
--- a/better-core-video-embeds.php
+++ b/better-core-video-embeds.php
@@ -40,7 +40,7 @@ function hd_bcve_enqueue_scripts() {
 		// enqueue the front end script to invoking the video embed on image click.
 		wp_enqueue_script(
 			'better-core-video-embeds-js',
-			HD_BCVE_LOCATION_URL . '/assets/js/better-core-video-embeds.min.js',
+			HD_BCVE_LOCATION_URL . '/assets/js/better-core-video-embeds.js',
 			false,
 			false,
 			true
@@ -192,8 +192,6 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 	// buffer the output as we need to return not echo.
 	ob_start();
 
-	//wp_var_dump( hd_job_allowed_innerblock_html() );
-
 	?>
 
 	<figure class="<?php echo esc_attr( implode( ' ', apply_filters( 'hd_bcve_wrapper_classes', $figure_classes, $block ) ) ); ?>" data-id="<?php echo esc_attr( $video_id ); ?>">

From dbbf98110e386d99141f5ac048518a8c12c62632 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Tue, 29 Nov 2022 09:03:31 +0000
Subject: [PATCH 05/11] JS improvements

---
 assets/js/better-core-video-embeds.js | 33 ++++++++++++++-------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/assets/js/better-core-video-embeds.js b/assets/js/better-core-video-embeds.js
index eeb36b6..bb07897 100644
--- a/assets/js/better-core-video-embeds.js
+++ b/assets/js/better-core-video-embeds.js
@@ -7,8 +7,22 @@ document.querySelectorAll( '.hd-bcve-wrapper' ).forEach(( el, i ) => {
 
 	// get the associated template element which holds the embed code.
 	var template = document.querySelector( '#hd-bcve-embed-html-' + videoId );
-	var caption = template.content.textContent;
-	caption = caption.trim();
+
+	/**
+	 * Add autoplay on the iframe as well as loading from youtube no cookie.
+	 * Grabs the iframe from the embed template.
+	 * Adds the autoplay and other attrs to the iframe src URL
+	 * Replaces the standard youtube domain with the no cookie version.
+	 */
+	var iframe = template.content.children[0].querySelector( 'iframe' );
+	var iframeSrc = iframe.getAttribute( 'src' ) + '&rel=0&showinfo=0&autoplay=1';
+	iframeSrc = iframeSrc.replace( 'www.youtube.com', 'www.youtube-nocookie.com' );
+	
+	// set the new iframe src including autoplay true.
+	iframe.setAttribute( 'src', iframeSrc );
+
+	// get the text content of the embed element - this is the caption.
+	var caption = template.content.textContent.trim();
 
 	// if we have a caption.
 	if ( '' !== caption ) {
@@ -28,23 +42,10 @@ document.querySelectorAll( '.hd-bcve-wrapper' ).forEach(( el, i ) => {
 
 		// clone the template element.
 		var contentOuter = template.content.cloneNode( true );
-
+		
 		// grab just the first child of the template - this is the figure block element which wraps the iframe.
 		var content = contentOuter.children[0];
 
-		// find the iframe in the embed content.
-		var iframe = content.querySelector( 'iframe' );
-
-		// add auto play true to the iframe src.
-		// ensures the video plays when the thumbnail is clicked.
-		var iframeSrc = iframe.getAttribute( 'src' ) + '&rel=0&showinfo=0&autoplay=1';
-		iframeSrc = iframeSrc.replace( 'www.youtube.com', 'www.youtube-nocookie.com' );
-		console.log( iframeSrc );
-		
-		// set the new iframe src including autoplay true.
-		iframe.setAttribute( 'src', iframeSrc );
-		
-
 		// add the iframe embed content before the embed wrapper.
 		el.before( content );
 

From a64da2c241a6d6929d4718e90ccd39f969756bc9 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Tue, 29 Nov 2022 09:07:46 +0000
Subject: [PATCH 06/11] Minify JS and load minified js file

---
 assets/js/better-core-video-embeds.min.js | 2 +-
 better-core-video-embeds.php              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/better-core-video-embeds.min.js b/assets/js/better-core-video-embeds.min.js
index 5006b35..23c4501 100644
--- a/assets/js/better-core-video-embeds.min.js
+++ b/assets/js/better-core-video-embeds.min.js
@@ -1 +1 @@
-document.querySelectorAll('.hd-bcve-wrapper').forEach((el,i)=>{el.addEventListener('click',()=>{var videoId=el.getAttribute('data-id');var template=document.querySelector('#hd-bcve-embed-html-'+videoId);var contentOuter=template.content.cloneNode(true);var content=contentOuter.children[0];var iframe=content.querySelector('iframe');var iframeSrc=iframe.getAttribute('src')+'&autoplay=true&rel=0&showinfo=0';var iframeSrcNew=iframeSrc.replace('www.youtube.com','www.youtube-nocookie.com');iframe.setAttribute('src',iframeSrcNew);el.before(content);el.remove();template.remove()})});
\ No newline at end of file
+document.querySelectorAll('.hd-bcve-wrapper').forEach((el,i)=>{var videoId=el.getAttribute('data-id');var template=document.querySelector('#hd-bcve-embed-html-'+videoId);var iframe=template.content.children[0].querySelector('iframe');var iframeSrc=iframe.getAttribute('src')+'&rel=0&showinfo=0&autoplay=1';iframeSrc=iframeSrc.replace('www.youtube.com','www.youtube-nocookie.com');iframe.setAttribute('src',iframeSrc);var caption=template.content.textContent.trim();if(''!==caption){var captionEl=document.createElement('figcaption');captionEl.classList.add('wp-element-caption');captionEl.textContent=caption;el.append(captionEl)}el.addEventListener('click',()=>{var contentOuter=template.content.cloneNode(true);var content=contentOuter.children[0];el.before(content);el.remove();template.remove()})});
\ No newline at end of file
diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
index 213913e..5c6613c 100644
--- a/better-core-video-embeds.php
+++ b/better-core-video-embeds.php
@@ -40,7 +40,7 @@ function hd_bcve_enqueue_scripts() {
 		// enqueue the front end script to invoking the video embed on image click.
 		wp_enqueue_script(
 			'better-core-video-embeds-js',
-			HD_BCVE_LOCATION_URL . '/assets/js/better-core-video-embeds.js',
+			HD_BCVE_LOCATION_URL . '/assets/js/better-core-video-embeds.min.js',
 			false,
 			false,
 			true

From faf4470a6ea476893dee9783fc9689e59dcc65ab Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Tue, 29 Nov 2022 09:38:09 +0000
Subject: [PATCH 07/11] Add provider slug class

---
 better-core-video-embeds.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
index 5c6613c..38396d3 100644
--- a/better-core-video-embeds.php
+++ b/better-core-video-embeds.php
@@ -77,7 +77,7 @@ function hd_bcve_register_block_style() {
  */
 function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 
-	// if the provider slug name is empty or not youtube.
+	// if the provider slug name is empty.
 	if ( empty( $block['attrs']['providerNameSlug'] ) ) {
 		return $block_content;
 	}
@@ -168,6 +168,7 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 	$figure_classes = [
 		'wp-block-image',
 		'hd-bcve-wrapper',
+		'is--' . $block['attrs']['providerNameSlug'],
 	];
 
 	// if we have classNames on the embed block.
@@ -198,6 +199,7 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 		<?php wp_print_styles( 'better-core-video-embeds-styles' ); // output the "block" styles for the thubmnail. ?>
 		<div class="play-button"></div>
 		<img loading="lazy" class="hd-bcve-thumbnail" src="<?php echo esc_url( $thumbnail_url ); ?>" />
+		<?php do_action( 'hd_bcve_after_video_thumbnail', $block, $video_id ); ?>
 	</figure>
 
 	<template id="hd-bcve-embed-html-<?php echo esc_attr( $video_id ); ?>">

From 70935b031454fd1c7db98a7dd82d374ca370cb4f Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Tue, 29 Nov 2022 10:36:52 +0000
Subject: [PATCH 08/11] Set allow attribure to autoplay

---
 assets/js/better-core-video-embeds.js     | 3 +++
 assets/js/better-core-video-embeds.min.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/js/better-core-video-embeds.js b/assets/js/better-core-video-embeds.js
index bb07897..e63123e 100644
--- a/assets/js/better-core-video-embeds.js
+++ b/assets/js/better-core-video-embeds.js
@@ -21,6 +21,9 @@ document.querySelectorAll( '.hd-bcve-wrapper' ).forEach(( el, i ) => {
 	// set the new iframe src including autoplay true.
 	iframe.setAttribute( 'src', iframeSrc );
 
+	// set an allows attribute on the iframe with an autoplay value.
+	iframe.setAttribute( 'allow', 'autoplay' );
+
 	// get the text content of the embed element - this is the caption.
 	var caption = template.content.textContent.trim();
 
diff --git a/assets/js/better-core-video-embeds.min.js b/assets/js/better-core-video-embeds.min.js
index 23c4501..b794d9e 100644
--- a/assets/js/better-core-video-embeds.min.js
+++ b/assets/js/better-core-video-embeds.min.js
@@ -1 +1 @@
-document.querySelectorAll('.hd-bcve-wrapper').forEach((el,i)=>{var videoId=el.getAttribute('data-id');var template=document.querySelector('#hd-bcve-embed-html-'+videoId);var iframe=template.content.children[0].querySelector('iframe');var iframeSrc=iframe.getAttribute('src')+'&rel=0&showinfo=0&autoplay=1';iframeSrc=iframeSrc.replace('www.youtube.com','www.youtube-nocookie.com');iframe.setAttribute('src',iframeSrc);var caption=template.content.textContent.trim();if(''!==caption){var captionEl=document.createElement('figcaption');captionEl.classList.add('wp-element-caption');captionEl.textContent=caption;el.append(captionEl)}el.addEventListener('click',()=>{var contentOuter=template.content.cloneNode(true);var content=contentOuter.children[0];el.before(content);el.remove();template.remove()})});
\ No newline at end of file
+document.querySelectorAll('.hd-bcve-wrapper').forEach((el,i)=>{var videoId=el.getAttribute('data-id');var template=document.querySelector('#hd-bcve-embed-html-'+videoId);var iframe=template.content.children[0].querySelector('iframe');var iframeSrc=iframe.getAttribute('src')+'&rel=0&showinfo=0&autoplay=1';iframeSrc=iframeSrc.replace('www.youtube.com','www.youtube-nocookie.com');iframe.setAttribute('src',iframeSrc);iframe.setAttribute('allow','autoplay');var caption=template.content.textContent.trim();if(''!==caption){var captionEl=document.createElement('figcaption');captionEl.classList.add('wp-element-caption');captionEl.textContent=caption;el.append(captionEl)}el.addEventListener('click',()=>{var contentOuter=template.content.cloneNode(true);var content=contentOuter.children[0];el.before(content);el.remove();template.remove()})});
\ No newline at end of file

From 3863e13a68507de355e57d8b7b93dfaf76027d68 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Tue, 29 Nov 2022 11:13:06 +0000
Subject: [PATCH 09/11] Prevent CSS being removed on additional page vids

---
 better-core-video-embeds.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
index 38396d3..318ec43 100644
--- a/better-core-video-embeds.php
+++ b/better-core-video-embeds.php
@@ -193,10 +193,12 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 	// buffer the output as we need to return not echo.
 	ob_start();
 
+	// output the registered "block" styles for the thubmnail.
+	wp_print_styles( 'better-core-video-embeds-styles' );
+
 	?>
 
 	<figure class="<?php echo esc_attr( implode( ' ', apply_filters( 'hd_bcve_wrapper_classes', $figure_classes, $block ) ) ); ?>" data-id="<?php echo esc_attr( $video_id ); ?>">
-		<?php wp_print_styles( 'better-core-video-embeds-styles' ); // output the "block" styles for the thubmnail. ?>
 		<div class="play-button"></div>
 		<img loading="lazy" class="hd-bcve-thumbnail" src="<?php echo esc_url( $thumbnail_url ); ?>" />
 		<?php do_action( 'hd_bcve_after_video_thumbnail', $block, $video_id ); ?>

From feedbf9ea584fe247abbb5f7de433007853b7a8e Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Tue, 29 Nov 2022 12:24:33 +0000
Subject: [PATCH 10/11] Enqueue styles the normal way

Prevents the issues with adjacent sibling selectors in CSS.
---
 better-core-video-embeds.php | 144 +++++++++++++++++++++++++++++------
 1 file changed, 121 insertions(+), 23 deletions(-)

diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
index 318ec43..df25649 100644
--- a/better-core-video-embeds.php
+++ b/better-core-video-embeds.php
@@ -56,15 +56,20 @@ function hd_bcve_enqueue_scripts() {
  */
 function hd_bcve_register_block_style() {
 
-	// register the style for this block.
-	wp_register_style(
-		'better-core-video-embeds-styles',
-		HD_BCVE_LOCATION_URL . '/assets/css/better-core-video-embeds.min.css'
-	);
+	// only if the page has a core embed block present.
+	if ( has_block( 'core/embed' ) ) {
+
+		// register the style for this block.
+		wp_enqueue_style(
+			'better-core-video-embeds-styles',
+			HD_BCVE_LOCATION_URL . '/assets/css/better-core-video-embeds.min.css'
+		);
+
+	}
 
 }
 
-add_action( 'wp', 'hd_bcve_register_block_style' );
+add_action( 'wp_enqueue_scripts', 'hd_bcve_register_block_style' );
 
 /**
  * Filters the code embed block output for improved performance on Youtube videos.
@@ -164,8 +169,8 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 		return $block_content;
 	}
 
-	// create an array of classes to add to the placeholder image figure.
-	$figure_classes = [
+	// create an array of classes to add to the placeholder image wrapper.
+	$wrapper_classes = [
 		'wp-block-image',
 		'hd-bcve-wrapper',
 		'is--' . $block['attrs']['providerNameSlug'],
@@ -178,7 +183,7 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 		$class_names = explode( ' ', $block['attrs']['className'] );
 
 		// merge the class names into the figures classes array.
-		$figure_classes = array_merge( $figure_classes, $class_names );
+		$wrapper_classes = array_merge( $wrapper_classes, $class_names );
 
 	}
 
@@ -186,29 +191,29 @@ function hd_bcve_render_core_embed_block( $block_content, $block, $instance ) {
 	if ( ! empty( $block['attrs']['align'] ) ) {
 
 		// add the alignment class to the figure classes.
-		$figure_classes[] = 'align' . $block['attrs']['align'];
+		$wrapper_classes[] = 'align' . $block['attrs']['align'];
 
 	}
 
+	// allow the classes to be filtered.
+	$wrapper_classes = apply_filters( '', $wrapper_classes, $block, $video_id, $thumbnail_url );
+
 	// buffer the output as we need to return not echo.
 	ob_start();
 
 	// output the registered "block" styles for the thubmnail.
 	wp_print_styles( 'better-core-video-embeds-styles' );
 
-	?>
-
-	<figure class="<?php echo esc_attr( implode( ' ', apply_filters( 'hd_bcve_wrapper_classes', $figure_classes, $block ) ) ); ?>" data-id="<?php echo esc_attr( $video_id ); ?>">
-		<div class="play-button"></div>
-		<img loading="lazy" class="hd-bcve-thumbnail" src="<?php echo esc_url( $thumbnail_url ); ?>" />
-		<?php do_action( 'hd_bcve_after_video_thumbnail', $block, $video_id ); ?>
-	</figure>
-
-	<template id="hd-bcve-embed-html-<?php echo esc_attr( $video_id ); ?>">
-		<?php echo wp_kses( $block['innerHTML'], hd_job_allowed_innerblock_html() ); ?>
-	</template>
-
-	<?php
+	/**
+	 * Fires and action to which the new block markup is added too.
+	 *
+	 * @hooked hd_bvce_open_markup_figure_element - 10
+	 * @hooked hd_bcve_add_video_play_button - 20
+	 * @hooked hd_bcve_add_video_thumbnail_markup - 30
+	 * @hooked hd_bvce_close_markup_figure_element - 40
+	 * @hooked hd_bcve_add_original_embed_template - 50
+	 */
+	do_action( 'hd_bcve_video_thumbnail_markup', $block, $video_id, $thumbnail_url, $wrapper_classes );
 
 	// return the new block markup.
 	return ob_get_clean();
@@ -341,3 +346,96 @@ function hd_job_allowed_innerblock_html() {
 	];
 
 }
+
+/**
+ * Adds the opening figure element to the thumbnail markup.
+ *
+ * @param array  $block           The block array.
+ * @param string $video_id        The ID of the embedded video.
+ * @param string $thumbnail_url   The URL of the video thumbnail.
+ * @param array  $wrapper_classes An array of CSS classes to add to the wrapper.
+ */
+function hd_bvce_open_markup_figure_element( $block, $video_id, $thumbnail_url, $wrapper_classes ) {
+
+	?>
+	<figure class="<?php echo esc_attr( implode( ' ', $wrapper_classes ) ); ?>" data-id="<?php echo esc_attr( $video_id ); ?>">
+	<?php
+
+}
+
+add_action( 'hd_bcve_video_thumbnail_markup', 'hd_bvce_open_markup_figure_element', 10, 4 );
+
+/**
+ * Adds the play button div to the markup.
+ *
+ * @param array  $block           The block array.
+ * @param string $video_id        The ID of the embedded video.
+ * @param string $thumbnail_url   The URL of the video thumbnail.
+ * @param array  $wrapper_classes An array of CSS classes to add to the wrapper.
+ */
+function hd_bcve_add_video_play_button( $block, $video_id, $thumbnail_url, $wrapper_classes ) {
+
+	?>
+	<div class="play-button"></div>
+	<?php
+
+}
+
+add_action( 'hd_bcve_video_thumbnail_markup', 'hd_bcve_add_video_play_button', 20, 4 );
+
+/**
+ * Adds the video thumbnail markup output.
+ *
+ * @param array  $block           The block array.
+ * @param string $video_id        The ID of the embedded video.
+ * @param string $thumbnail_url   The URL of the video thumbnail.
+ * @param array  $wrapper_classes An array of CSS classes to add to the wrapper.
+ */
+function hd_bcve_add_video_thumbnail_markup( $block, $video_id, $thumbnail_url, $wrapper_classes ) {
+
+	?>
+	<img loading="lazy" class="hd-bcve-thumbnail" src="<?php echo esc_url( $thumbnail_url ); ?>" />
+	<?php
+
+}
+
+add_action( 'hd_bcve_video_thumbnail_markup', 'hd_bcve_add_video_thumbnail_markup', 30, 4 );
+
+/**
+ * Adds the closing figure element to the thumbnail markup.
+ *
+ * @param array  $block           The block array.
+ * @param string $video_id        The ID of the embedded video.
+ * @param string $thumbnail_url   The URL of the video thumbnail.
+ * @param array  $wrapper_classes An array of CSS classes to add to the wrapper.
+ */
+function hd_bcve_close_markup_figure_element( $block, $video_id, $thumbnail_url, $wrapper_classes ) {
+
+	?>
+	</figure>
+	<?php
+
+}
+
+add_action( 'hd_bcve_video_thumbnail_markup', 'hd_bcve_close_markup_figure_element', 40, 4 );
+
+/**
+ * Adds the original block markup to the template element.
+ * This is used when the item is cloned when the thumbnail is clicked.
+ *
+ * @param array  $block           The block array.
+ * @param string $video_id        The ID of the embedded video.
+ * @param string $thumbnail_url   The URL of the video thumbnail.
+ * @param array  $wrapper_classes An array of CSS classes to add to the wrapper.
+ */
+function hd_bcve_add_original_embed_template( $block, $video_id, $thumbnail_url, $wrapper_classes ) {
+
+	?>
+	<template id="hd-bcve-embed-html-<?php echo esc_attr( $video_id ); ?>">
+		<?php echo wp_kses( $block['innerHTML'], hd_job_allowed_innerblock_html() ); ?>
+	</template>
+	<?php
+
+}
+
+add_action( 'hd_bcve_video_thumbnail_markup', 'hd_bcve_add_original_embed_template', 50, 4 );

From de7d694997f59cc1ab5c624775e36120260ad7c9 Mon Sep 17 00:00:00 2001
From: Mark Wilkinson <mark@highrise.digital>
Date: Tue, 29 Nov 2022 13:14:32 +0000
Subject: [PATCH 11/11] Bump version number and update readme

---
 better-core-video-embeds.php |  2 +-
 readme.txt                   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/better-core-video-embeds.php b/better-core-video-embeds.php
index 1a32bb3..773911a 100644
--- a/better-core-video-embeds.php
+++ b/better-core-video-embeds.php
@@ -4,7 +4,7 @@
 Description: A plugin which enhances the core video embeds for Youtube and Vimeo videos by not loading unnecessary scripts until they are needed.
 Requires at least: 6.0
 Requires PHP: 7.0
-Version: 1.0
+Version: 1.1
 Author: Highrise Digital
 Author URI: https://highrise.digital/
 License: GPL-2.0-or-later
diff --git a/readme.txt b/readme.txt
index b38e122..4aef1a4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,12 +4,12 @@ Donate link: https://example.com/
 Tags: embed, oembed, youtube, vimeo
 Requires at least: 6.0
 Tested up to: 6.1.1
-Stable tag: 1.0
+Stable tag: 1.1
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
-A plugin which enhances the core embed block for Youtube and Vimeo videos by not loading unnecessary scripts until they are needed.
+A plugin which enhances the core embed block for Youtube, Daily Motion and Vimeo videos by not loading unnecessary scripts until they are needed.
 
 == Description ==
 
@@ -45,6 +45,14 @@ The plugin provides progressive enhancement, therefore if you no longer use this
 
 == Changelog ==
 
+= 1.1 (29/11/2022) =
+* Updated a bug where the CSS was not loading for some users.
+* Added support for Daily Motion videos
+* Enqueued the stylesheet using the standard `wp_enqueue_style` function rather than using print styles
+* Improved the way the thumbnail markup is output, making this more extensible and easier for developers to modify
+* Added support for the embed caption to show beneath the thumbnail image
+* Adds the embed provider slug as a class on the thumbnail wrapper
+
 = 1.0 (23/11/2022) =
 * Initial plugin launch added to the WP.org repository.