Handle post (any type) on-save and don't filter out cld urls if dealing with amp

dugajean · dugajean · commit b1a50cd65afc · 2021-01-26T15:29:24.000-05:00
diff --git a/php/class-cli.php b/php/class-cli.php
@@ -61,7 +61,7 @@ public function __construct( $plugin ) {
 	 * Syncs assets with Cloudinary.
 	 * ## EXAMPLES
 	 *
-	 *     wp cloudinary sync
+	 *     Wp cloudinary sync
 	 *
 	 * @when    after_wp_load
 	 * @since   2.5.1
@@ -102,7 +102,7 @@ public function sync( $args, $assoc_args ) {
 	 * Analyze assets with Cloudinary.
 	 * ## EXAMPLES
 	 *
-	 *     wp cloudinary analyze
+	 *     Wp cloudinary analyze
 	 *
 	 * @when    after_wp_load
 	 * @since   2.5.1
diff --git a/php/class-utils.php b/php/class-utils.php
@@ -8,6 +8,7 @@
 namespace Cloudinary;
 
 use Cloudinary\Settings\Setting;
+use Google\Web_Stories\Story_Post_Type;
 
 /**
  * Class that includes utility methods.
@@ -81,4 +82,27 @@ public static function expand_dot_notation( array $input, $separator = '.' ) {
 
 		return $result;
 	}
+
+	/**
+	 * Check whether the inputted HTML string is powered by AMP.
+	 * Reference on how to detect an AMP page: https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml/?format=websites#ampd.
+	 *
+	 * @param string $html_string The HTML string to check.
+	 *
+	 * @return bool
+	 */
+	public static function is_amp( $html_string ) {
+		return strpos( $html_string, '<html amp' ) !== false || strpos( $html_string, '<html ⚡' ) !== false;
+	}
+
+	/**
+	 * Check whether the inputted post type is a webstory.
+	 *
+	 * @param string $post_type The post type to compare to.
+	 *
+	 * @return bool
+	 */
+	public static function is_webstory_post_type( $post_type ) {
+		return class_exists( Story_Post_Type::class ) && Story_Post_Type::POST_TYPE_SLUG === $post_type;
+	}
 }
diff --git a/php/media/class-filter.php b/php/media/class-filter.php
@@ -8,6 +8,8 @@
 namespace Cloudinary\Media;
 
 use Cloudinary\Connect\Api;
+use Cloudinary\Utils;
+use Google\Web_Stories\Story_Post_Type;
 
 /**
  * Class Filter.
@@ -243,6 +245,10 @@ public function filter_video_shortcodes( $content ) {
 	 * @return array
 	 */
 	public function filter_out_cloudinary( $data ) {
+		// Check whether this page is powered by AMP or is a web story. Bail if that's the case.
+		if ( Utils::is_webstory_post_type( $data['post_type'] ) || Utils::is_amp( $data['post_content'] ) ) {
+			return $data;
+		}
 
 		$content = trim( wp_unslash( $data['post_content'] ) );
 		$assets  = $this->get_media_tags( $content );
diff --git a/php/media/class-video.php b/php/media/class-video.php
@@ -256,7 +256,7 @@ public function filter_video_shortcode( $html, $attr ) {
 	 */
 	public function filter_video_tags( $content ) {
 
-		$video_tags = $this->media->filter->get_media_tags( $content, 'video|source' );
+		$video_tags = $this->media->filter->get_media_tags( $content, 'video' );
 		foreach ( $video_tags as $tag ) {
 			$args = array();
 
@@ -282,10 +282,7 @@ public function filter_video_tags( $content ) {
 			}
 			$attachment_id = $this->media->filter->get_id_from_tag( $tag );
 			if ( empty( $attachment_id ) ) {
-				$attachment_id = attachment_url_to_postid( $url );
-				if ( ! $attachment_id ) {
-					continue; // Missing or no attachment ID found.
-				}
+				continue; // Missing or no attachment ID found.
 			}
 			// Enable Autoplay for this video.
 			if ( false !== strpos( $tag, 'autoplay' ) ) {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function __construct( $plugin ) {`
`61`	`61`	`* Syncs assets with Cloudinary.`
`62`	`62`	`* ## EXAMPLES`
`63`	`63`	`*`
`64`		`- * wp cloudinary sync`
	`64`	`+ * Wp cloudinary sync`
`65`	`65`	`*`
`66`	`66`	`* @when after_wp_load`
`67`	`67`	`* @since 2.5.1`
`@@ -102,7 +102,7 @@ public function sync( $args, $assoc_args ) {`
`102`	`102`	`* Analyze assets with Cloudinary.`
`103`	`103`	`* ## EXAMPLES`
`104`	`104`	`*`
`105`		`- * wp cloudinary analyze`
	`105`	`+ * Wp cloudinary analyze`
`106`	`106`	`*`
`107`	`107`	`* @when after_wp_load`
`108`	`108`	`* @since 2.5.1`