Merge pull request #348 from cloudinary/fix/ws-broken-videos

pereirinha · web-flow · commit f7f36679287b · 2021-01-27T16:12:21.000Z
Exclude AMP pages from Cloudinary URL removal when saving
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,7 @@
 namespace Cloudinary\Media;
 
 use Cloudinary\Connect\Api;
+use Cloudinary\Utils;
 
 /**
  * Class Filter.
@@ -243,6 +244,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/phpcs.xml.dist b/phpcs.xml.dist
@@ -21,6 +21,10 @@
 		</properties>
 	</rule>
 
+	<rule ref="Generic.Commenting.DocComment.LongNotCapital">
+		<exclude-pattern>php/class-cli.php</exclude-pattern>
+	</rule>
+
 	<!-- Include WP VIP coding standard checks -->
 	<rule ref="WordPress-VIP-Go" />
 	<rule ref="WordPressVIPMinimum" />
