Unwrap all embeds with paragraph tags

includes/embeds/class-amp-base-embed-handler.php

@@ -107,4 +107,21 @@ function ( $attr_name ) {
 		}
 		return wp_array_slice_assoc( $matches, $attribute_names );
 	}
+
+	/**
+	 * Replace the node's parent with itself if the parent is a <p> tag, has no attributes and has no other children.
+	 * This usually happens while `wpautop()` processes the element.
+	 *
+	 * @param DOMElement $node Node.
+	 */
+	protected function maybe_unwrap_p_element( DOMElement $node ) {
+		$parent_element = AMP_DOM_Utils::get_parent_element( $node );
+
+		if ( $parent_element && 'p' === $parent_element->nodeName && false === $parent_element->hasAttributes() ) {
+			$children = $parent_element->getElementsByTagName( '*' );
+			if ( 1 === $children->length ) {
+				$parent_element->parentNode->replaceChild( $node, $parent_element );
+			}
+		}
+	}
 }

includes/embeds/class-amp-dailymotion-embed-handler.php

@@ -5,15 +5,16 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_DailyMotion_Embed_Handler
  *
  * Much of this class is borrowed from Jetpack embeds
  */
 class AMP_DailyMotion_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	const URL_PATTERN = '#https?:\/\/(www\.)?dailymotion\.com\/video\/.*#i';
-	const RATIO       = 0.5625;
+	const RATIO = 0.5625;
 
 	/**
 	 * Default width.
@@ -48,86 +49,69 @@ public function __construct( $args = [] ) {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		wp_embed_register_handler( 'amp-dailymotion', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-dailymotion', -1 );
+		// Not implemented.
 	}
 
 	/**
-	 * Render oEmbed.
-	 *
-	 * @see \WP_Embed::shortcode()
+	 * Sanitize all DailyMotion <iframe> tags to <amp-dailymotion>.
 	 *
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Shortcode attributes.
-	 * @param string $url     URL.
-	 * @param string $rawattr Unmodified shortcode attributes.
-	 * @return string Rendered oEmbed.
+	 * @param Document $dom DOM.
 	 */
-	public function oembed( $matches, $attr, $url, $rawattr ) {
-		$video_id = $this->get_video_id_from_url( $url );
-		return $this->render(
-			[
-				'video_id' => $video_id,
-			]
-		);
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://www.dailymotion.com/embed/video/" ) ]' );
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+			$this->sanitize_raw_embed( $node );
+		}
 	}
 
 	/**
-	 * Render.
+	 * Determine if the node has already been sanitized.
 	 *
-	 * @param array $args Args.
-	 * @return string Rendered.
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'video_id' => false,
-			]
-		);
-
-		if ( empty( $args['video_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
-				[
-					'href'  => esc_url_raw( $args['url'] ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $args['url'] )
-			);
-		}
-
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag(
-			'amp-dailymotion',
-			[
-				'data-videoid' => $args['video_id'],
-				'layout'       => 'responsive',
-				'width'        => $this->args['width'],
-				'height'       => $this->args['height'],
-			]
-		);
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-dailymotion' !== $node->parentNode->nodeName;
 	}
 
 	/**
-	 * Determine the video ID from the URL.
+	 * Make DailyMotion embed AMP compatible.
 	 *
-	 * @param string $url URL.
-	 * @return integer Video ID.
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
 	 */
-	private function get_video_id_from_url( $url ) {
-		$parsed_url = wp_parse_url( $url );
-		parse_str( $parsed_url['path'], $path );
-		$tok = explode( '/', $parsed_url['path'] );
-		$tok = explode( '_', $tok[2] );
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$iframe_src = $iframe_node->getAttribute( 'src' );
+
+		if ( preg_match( '#video/(?P<video_id>[a-zA-Z0-9]+)#', $iframe_src, $matches ) ) {
+			$video_id = $matches['video_id'];
+
+			$amp_node = AMP_DOM_Utils::create_node(
+				Document::fromNode( $iframe_node ),
+				'amp-dailymotion',
+				[
+					'data-videoid' => $video_id,
+					'layout'       => 'responsive',
+					'width'        => $this->args['width'],
+					'height'       => $this->args['height'],
+				]
+			);
+
+			$this->maybe_unwrap_p_element( $iframe_node );
+
+			$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
+		}
 
-		return $tok[0];
+		// Nothing to be done if the video ID could not be found.
 	}
 }

includes/embeds/class-amp-gfycat-embed-handler.php

@@ -6,6 +6,8 @@
  * @since 1.0
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Gfycat_Embed_Handler
  */
@@ -21,61 +23,80 @@ class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
+		// Not implemented.
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+		// Not implemented.
 	}
 
 	/**
-	 * Filter oEmbed HTML for Gfycat to prepare it for AMP.
+	 * Sanitize all gfycat <iframe> tags to <amp-gfycat>.
 	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
+	 * @param Document $dom DOM.
 	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'gfycat.com' ) ) {
-			if ( preg_match( '/width=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
-			}
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//iframe[ starts-with( @src, "https://gfycat.com/ifr/" ) ]' );
 
-			if ( empty( $attr['height'] ) ) {
-				return $return;
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
 			}
+			$this->sanitize_raw_embed( $node );
+		}
+	}
 
-			$attributes = wp_array_slice_assoc( $attr, [ 'width', 'height' ] );
+	/**
+	 * Determine if the node has already been sanitized.
+	 *
+	 * @param DOMElement $node The DOMNode.
+	 * @return bool Whether the node is a raw embed.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && 'amp-gfycat' !== $node->parentNode->nodeName;
+	}
 
-			if ( empty( $attr['width'] ) ) {
-				$attributes['layout'] = 'fixed-height';
-				$attributes['width']  = 'auto';
-			}
+	/**
+	 * Make DailyMotion embed AMP compatible.
+	 *
+	 * @param DOMElement $iframe_node The node to make AMP compatible.
+	 */
+	private function sanitize_raw_embed( DOMElement $iframe_node ) {
+		$iframe_src = $iframe_node->getAttribute( 'src' );
 
-			$pieces = explode( '/detail/', $parsed_url['path'] );
-			if ( ! isset( $pieces[1] ) ) {
-				if ( ! preg_match( '/\/([A-Za-z0-9]+)/', $parsed_url['path'], $matches ) ) {
-					return $return;
-				}
-				$attributes['data-gfyid'] = $matches[1];
-			} else {
-				$attributes['data-gfyid'] = $pieces[1];
-			}
+		if ( ! preg_match( '#/ifr/([A-Za-z0-9]+)#', $iframe_src, $matches ) ) {
+			// Nothing to do if video ID could not be found.
+			return;
+		}
+
+		$new_attributes = [
+			'data-gfyid' => $matches[1],
+			'layout'     => 'responsive',
+			'height'     => $iframe_node->getAttribute( 'height' ),
+			'width'      => $iframe_node->getAttribute( 'width' ),
+		];
 
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-gfycat',
-				$attributes
-			);
+		if ( empty( $new_attributes['height'] ) ) {
+			return;
 		}
-		return $return;
+
+		if ( empty( $new_attributes['width'] ) ) {
+			$new_attributes['layout'] = 'fixed-height';
+			$new_attributes['width']  = 'auto';
+		}
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $iframe_node ),
+			'amp-gfycat',
+			$new_attributes
+		);
+
+		$this->maybe_unwrap_p_element( $iframe_node );
+
+		$iframe_node->parentNode->replaceChild( $amp_node, $iframe_node );
 	}
 }