Remove handling of Jetpack shortcodes

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

@@ -49,43 +49,13 @@ public function __construct( $args = [] ) {
 	 */
 	public function register_embed() {
 		wp_embed_register_handler( 'amp-dailymotion', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-		add_shortcode( 'dailymotion', [ $this, 'shortcode' ] );
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
 		wp_embed_unregister_handler( 'amp-dailymotion', -1 );
-		remove_shortcode( 'dailymotion' );
-	}
-
-	/**
-	 * Gets AMP-compliant markup for the Dailymotion shortcode.
-	 *
-	 * @param array $attr The Dailymotion attributes.
-	 * @return string Dailymotion shortcode markup.
-	 */
-	public function shortcode( $attr ) {
-		$video_id = false;
-
-		if ( isset( $attr['id'] ) ) {
-			$video_id = $attr['id'];
-		} elseif ( isset( $attr[0] ) ) {
-			$video_id = $attr[0];
-		} elseif ( function_exists( 'shortcode_new_to_old_params' ) ) {
-			$video_id = shortcode_new_to_old_params( $attr );
-		}
-
-		if ( empty( $video_id ) ) {
-			return '';
-		}
-
-		return $this->render(
-			[
-				'video_id' => $video_id,
-			]
-		);
 	}
 
 	/**
@@ -94,7 +64,7 @@ public function shortcode( $attr ) {
 	 * @see \WP_Embed::shortcode()
 	 *
 	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Shortcode attribues.
+	 * @param array  $attr    Shortcode attributes.
 	 * @param string $url     URL.
 	 * @param string $rawattr Unmodified shortcode attributes.
 	 * @return string Rendered oEmbed.

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

@@ -34,9 +34,9 @@ public function unregister_embed() {
 	/**
 	 * Filter oEmbed HTML for Gfycat to prepare it for AMP.
 	 *
-	 * @param mixed  $return The shortcode callback function to call.
+	 * @param mixed  $return The oEmbed HTML.
 	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   An array of shortcode attributes.
+	 * @param array  $attr   Attributes.
 	 * @return string Embed.
 	 */
 	public function filter_embed_oembed_html( $return, $url, $attr ) {

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

@@ -41,9 +41,9 @@ public function unregister_embed() {
 	/**
 	 * Filter oEmbed HTML for Hulu to prepare it for AMP.
 	 *
-	 * @param mixed  $return The shortcode callback function to call.
+	 * @param mixed  $return The oEmbed HTML.
 	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   An array of shortcode attributes.
+	 * @param array  $attr   Attributes.
 	 * @return string Embed.
 	 */
 	public function filter_embed_oembed_html( $return, $url, $attr ) {

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

@@ -90,9 +90,9 @@ public function render( $args ) {
 	/**
 	 * Filter oEmbed HTML for Imgur to prepare it for AMP.
 	 *
-	 * @param mixed  $return The shortcode callback function to call.
+	 * @param mixed  $return The oEmbed HTML.
 	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   An array of shortcode attributes.
+	 * @param array  $attr   Attributes.
 	 * @return string Embed.
 	 */
 	public function filter_embed_oembed_html( $return, $url, $attr ) {

includes/embeds/class-amp-instagram-embed.php

@@ -47,42 +47,13 @@ class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	public function register_embed() {
 		wp_embed_register_handler( $this->amp_tag, self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-		add_shortcode( 'instagram', [ $this, 'shortcode' ] );
 	}
 
 	/**
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
 		wp_embed_unregister_handler( $this->amp_tag, -1 );
-		remove_shortcode( 'instagram' );
-	}
-
-	/**
-	 * WordPress shortcode rendering callback.
-	 *
-	 * @param array $attr Shortcode attributes.
-	 * @return string HTML markup for rendered embed.
-	 */
-	public function shortcode( $attr ) {
-		$url = false;
-
-		if ( isset( $attr['url'] ) ) {
-			$url = trim( $attr['url'] );
-		}
-
-		if ( empty( $url ) ) {
-			return '';
-		}
-
-		$instagram_id = $this->get_instagram_id_from_url( $url );
-
-		return $this->render(
-			[
-				'url'          => $url,
-				'instagram_id' => $instagram_id,
-			]
-		);
 	}
 
 	/**

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

@@ -34,9 +34,9 @@ public function unregister_embed() {
 	/**
 	 * Filter oEmbed HTML for Meetup to prepare it for AMP.
 	 *
-	 * @param mixed  $return The shortcode callback function to call.
+	 * @param mixed  $return The oEmbed HTML.
 	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   An array of shortcode attributes.
+	 * @param array  $attr   Attributes.
 	 * @return string Embed.
 	 */
 	public function filter_embed_oembed_html( $return, $url, $attr ) {

includes/embeds/class-amp-soundcloud-embed.php

@@ -23,21 +23,13 @@ class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Register embed.
 	 */
 	public function register_embed() {
-		if ( function_exists( 'soundcloud_shortcode' ) ) {
-			// @todo Move this to Jetpack.
-			add_shortcode( 'soundcloud', [ $this, 'shortcode' ] );
-		}
 		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
 	}
 
 	/**
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		if ( function_exists( 'soundcloud_shortcode' ) ) {
-			// @todo Move this to Jetpack.
-			remove_shortcode( 'soundcloud' );
-		}
 		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
 	}
 
@@ -111,44 +103,6 @@ private function parse_amp_component_from_iframe( $html, $url = null ) {
 		return $this->render( $props, $url );
 	}
 
-	/**
-	 * Render shortcode.
-	 *
-	 * @todo Move this to Jetpack.
-	 *
-	 * @param array  $attr    Shortcode attributes.
-	 * @param string $content Shortcode content.
-	 * @return string Rendered shortcode.
-	 */
-	public function shortcode( $attr, $content = null ) {
-		if ( ! function_exists( 'soundcloud_shortcode' ) ) {
-			return '';
-		}
-
-		if ( isset( $attr['url'] ) ) {
-			$url = $attr['url'];
-		} elseif ( isset( $attr['id'] ) ) {
-			$url = 'https://api.soundcloud.com/tracks/' . $attr['id'];
-		} elseif ( isset( $attr[0] ) ) {
-			$url = is_numeric( $attr[0] ) ? 'https://api.soundcloud.com/tracks/' . $attr[0] : $attr[0];
-		} elseif ( function_exists( 'shortcode_new_to_old_params' ) ) {
-			$url = shortcode_new_to_old_params( $attr );
-		}
-
-		// Defer to oEmbed if an oEmbeddable URL is provided.
-		if ( isset( $url ) && 'api.soundcloud.com' !== wp_parse_url( $url, PHP_URL_HOST ) ) {
-			global $wp_embed;
-			return $wp_embed->shortcode( $attr, $url );
-		}
-
-		if ( isset( $url ) && ! isset( $attr['url'] ) ) {
-			$attr['url'] = $url;
-		}
-		$output = soundcloud_shortcode( $attr, $content );
-
-		return $this->parse_amp_component_from_iframe( $output, null );
-	}
-
 	/**
 	 * Render embed.
 	 *

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

@@ -46,91 +46,16 @@ class AMP_Twitter_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * Registers embed.
 	 */
 	public function register_embed() {
-		add_shortcode( 'tweet', [ $this, 'shortcode' ] ); // Note: This is a Jetpack shortcode.
 		wp_embed_register_handler( 'amp-twitter-timeline', self::URL_PATTERN_TIMELINE, [ $this, 'oembed_timeline' ], -1 );
 	}
 
 	/**
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		remove_shortcode( 'tweet' ); // Note: This is a Jetpack shortcode.
 		wp_embed_unregister_handler( 'amp-twitter-timeline', -1 );
 	}
 
-	/**
-	 * Gets AMP-compliant markup for the Twitter shortcode.
-	 *
-	 * Note that this shortcode is is defined in Jetpack.
-	 *
-	 * @param array $attr The Twitter attributes.
-	 * @return string Twitter shortcode markup.
-	 */
-	public function shortcode( $attr ) {
-		$attr = wp_parse_args(
-			$attr,
-			[
-				'tweet' => false,
-			]
-		);
-
-		if ( empty( $attr['tweet'] ) && ! empty( $attr[0] ) ) {
-			$attr['tweet'] = $attr[0];
-		}
-
-		$id = false;
-		if ( is_numeric( $attr['tweet'] ) ) {
-			$id = $attr['tweet'];
-		} else {
-			preg_match( self::URL_PATTERN, $attr['tweet'], $matches );
-			if ( isset( $matches['tweet'] ) && is_numeric( $matches['tweet'] ) ) {
-				$id = $matches['tweet'];
-			}
-
-			if ( empty( $id ) ) {
-				return '';
-			}
-		}
-
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag(
-			$this->amp_tag,
-			[
-				'data-tweetid' => $id,
-				'layout'       => 'responsive',
-				'width'        => $this->args['width'],
-				'height'       => $this->args['height'],
-			]
-		);
-	}
-
-	/**
-	 * Render oEmbed.
-	 *
-	 * @deprecated Since 1.1 as now the sanitize_raw_embeds() is used exclusively, allowing the
-	 *             original oEmbed response to be wrapped with `amp-twitter`.
-	 *
-	 * @see \WP_Embed::shortcode()
-	 *
-	 * @param array $matches URL pattern matches.
-	 * @return string Rendered oEmbed.
-	 */
-	public function oembed( $matches ) {
-		_deprecated_function( __METHOD__, '1.1' );
-		$id = false;
-
-		if ( isset( $matches['tweet'] ) && is_numeric( $matches['tweet'] ) ) {
-			$id = $matches['tweet'];
-		}
-
-		if ( ! $id ) {
-			return '';
-		}
-
-		return $this->shortcode( [ 'tweet' => $id ] );
-	}
-
 	/**
 	 * Render oEmbed for a timeline.
 	 *

includes/embeds/class-amp-vimeo-embed.php

@@ -12,8 +12,18 @@
  */
 class AMP_Vimeo_Embed_Handler extends AMP_Base_Embed_Handler {
 
+	/**
+	 * The embed URL pattern.
+	 *
+	 * @var string
+	 */
 	const URL_PATTERN = '#https?:\/\/(www\.)?vimeo\.com\/.*#i';
 
+	/**
+	 * The aspect ratio.
+	 *
+	 * @var float
+	 */
 	const RATIO = 0.5625;
 
 	/**
@@ -50,7 +60,6 @@ public function __construct( $args = [] ) {
 	 */
 	public function register_embed() {
 		wp_embed_register_handler( 'amp-vimeo', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-		add_shortcode( 'vimeo', [ $this, 'shortcode' ] );
 		add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10, 2 );
 	}
 
@@ -59,37 +68,6 @@ public function register_embed() {
 	 */
 	public function unregister_embed() {
 		wp_embed_unregister_handler( 'amp-vimeo', -1 );
-		remove_shortcode( 'vimeo' );
-	}
-
-	/**
-	 * Gets AMP-compliant markup for the Vimeo shortcode.
-	 *
-	 * @param array $attr The Vimeo attributes.
-	 * @return string Vimeo shortcode markup.
-	 */
-	public function shortcode( $attr ) {
-		$video_id = false;
-
-		if ( isset( $attr['id'] ) ) {
-			$video_id = $attr['id'];
-		} elseif ( isset( $attr['url'] ) ) {
-			$video_id = $this->get_video_id_from_url( $attr['url'] );
-		} elseif ( isset( $attr[0] ) ) {
-			$video_id = $this->get_video_id_from_url( $attr[0] );
-		} elseif ( function_exists( 'shortcode_new_to_old_params' ) ) {
-			$video_id = shortcode_new_to_old_params( $attr );
-		}
-
-		if ( empty( $video_id ) ) {
-			return '';
-		}
-
-		return $this->render(
-			[
-				'video_id' => $video_id,
-			]
-		);
 	}
 
 	/**
@@ -186,10 +164,16 @@ public function video_override( $html, $attr ) {
 		}
 		$src           = $attr['src'];
 		$vimeo_pattern = '#^https?://(.+\.)?vimeo\.com/.*#';
-		if ( 1 === preg_match( $vimeo_pattern, $src ) ) {
-			return $this->shortcode( [ $src ] );
+		if ( 1 !== preg_match( $vimeo_pattern, $src ) ) {
+			return $html;
 		}
-		return $html;
+
+		$video_id = $this->get_video_id_from_url( $src );
+		if ( empty( $video_id ) ) {
+			return '';
+		}
+
+		return $this->render( compact( 'video_id' ) );
 	}
 
 }