Remove handling of Jetpack shortcodes

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

@@ -77,4 +77,18 @@ public function __construct( $args = [] ) {
 	public function get_scripts() {
 		return [];
 	}
+
+	/**
+	 * Gets whether a certain Jetpack shortcode's AMP implementation is available in Jetpack.
+	 *
+	 * This logic is being migrated to Jetpack, so check whether it's available there
+	 * before running the shortcode logic here.
+	 *
+	 * @param string $shortcode_tag The tag (name) of the shortcode.
+	 * @return bool Whether the AMP version of the passed shortcode is available in Jetpack.
+	 */
+	public function is_amp_shortcode_available_in_jetpack( $shortcode_tag ) {
+		$upper_tag = ucfirst( $shortcode_tag );
+		return false !== has_filter( 'do_shortcode_tag', [ "Jetpack_AMP_{$upper_tag}_Shortcode", 'filter_shortcode' ] );
+	}
 }

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

@@ -12,6 +12,13 @@
  */
 class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 
+	/**
+	 * The tag (name) of the shortcode.
+	 *
+	 * @var string
+	 */
+	const SHORTCODE_TAG = 'soundcloud';
+
 	/**
 	 * Default height.
 	 *
@@ -23,9 +30,8 @@ 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' ] );
+		if ( ! $this->is_amp_shortcode_available_in_jetpack( self::SHORTCODE_TAG ) ) {
+			add_shortcode( self::SHORTCODE_TAG, [ $this, 'shortcode' ] );
 		}
 		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
 	}
@@ -34,9 +40,8 @@ public function register_embed() {
 	 * Unregister embed.
 	 */
 	public function unregister_embed() {
-		if ( function_exists( 'soundcloud_shortcode' ) ) {
-			// @todo Move this to Jetpack.
-			remove_shortcode( 'soundcloud' );
+		if ( ! $this->is_amp_shortcode_available_in_jetpack( self::SHORTCODE_TAG ) ) {
+			remove_shortcode( self::SHORTCODE_TAG );
 		}
 		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
 	}

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

@@ -28,6 +28,13 @@ class AMP_Twitter_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	const URL_PATTERN_TIMELINE = '#https?:\/\/twitter\.com(?:\/\#\!\/|\/)(?P<username>[a-zA-Z0-9_]{1,20})(?:$|\/(?P<type>likes|lists)(\/(?P<id>[a-zA-Z0-9_-]+))?)#i';
 
+	/**
+	 * The tag (name) of the shortcode.
+	 *
+	 * @var string
+	 */
+	const SHORTCODE_TAG = 'vimeo';
+
 	/**
 	 * Tag.
 	 *
@@ -46,7 +53,9 @@ 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.
+		if ( ! $this->is_amp_shortcode_available_in_jetpack( self::SHORTCODE_TAG ) ) {
+			add_shortcode( self::SHORTCODE_TAG, [ $this, 'shortcode' ] );
+		}
 		wp_embed_register_handler( 'amp-twitter', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
 		wp_embed_register_handler( 'amp-twitter-timeline', self::URL_PATTERN_TIMELINE, [ $this, 'oembed_timeline' ], -1 );
 	}
@@ -55,7 +64,9 @@ public function register_embed() {
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		remove_shortcode( 'tweet' ); // Note: This is a Jetpack shortcode.
+		if ( ! $this->is_amp_shortcode_available_in_jetpack( self::SHORTCODE_TAG ) ) {
+			remove_shortcode( self::SHORTCODE_TAG );
+		}
 		wp_embed_unregister_handler( 'amp-twitter', -1 );
 		wp_embed_unregister_handler( 'amp-twitter-timeline', -1 );
 	}

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

@@ -12,10 +12,27 @@
  */
 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;
 
+	/**
+	 * The tag (name) of the shortcode.
+	 *
+	 * @var string
+	 */
+	const SHORTCODE_TAG = 'vimeo';
+
 	/**
 	 * Default width.
 	 *
@@ -50,7 +67,9 @@ 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' ] );
+		if ( ! $this->is_amp_shortcode_available_in_jetpack( self::SHORTCODE_TAG ) ) {
+			add_shortcode( self::SHORTCODE_TAG, [ $this, 'shortcode' ] );
+		}
 		add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10, 2 );
 	}
 
@@ -59,7 +78,9 @@ public function register_embed() {
 	 */
 	public function unregister_embed() {
 		wp_embed_unregister_handler( 'amp-vimeo', -1 );
-		remove_shortcode( 'vimeo' );
+		if ( ! $this->is_amp_shortcode_available_in_jetpack( self::SHORTCODE_TAG ) ) {
+			remove_shortcode( self::SHORTCODE_TAG );
+		}
 	}
 
 	/**

tests/php/test-amp-vimeo-embed.php

@@ -12,6 +12,15 @@
  */
 class AMP_Vimeo_Embed_Test extends WP_UnitTestCase {
 
+	/**
+	 * Tears down the environment after each test.
+	 *
+	 * @inheritDoc
+	 */
+	public function tearDown() {
+		remove_all_filters( 'do_shortcode_tag' );
+	}
+
 	/**
 	 * Get conversion data.
 	 *
@@ -109,4 +118,23 @@ public function test__get_scripts( $source, $expected ) {
 
 		$this->assertEquals( $expected, $scripts );
 	}
+
+	/**
+	 * Test is_amp_shortcode_available_in_jetpack.
+	 *
+	 * @covers AMP_Base_Embed_Handler::is_amp_shortcode_available_in_jetpack()
+	 */
+	public function test_is_amp_shortcode_available_in_jetpack() {
+		remove_all_filters( 'do_shortcode_tag' );
+		$embed = new AMP_Vimeo_Embed_Handler();
+
+		// With the filter not added, this filter should return false.
+		$this->assertFalse( $embed->is_amp_shortcode_available_in_jetpack( 'vimeo' ) );
+
+		add_filter( 'do_shortcode_tag', [ 'Jetpack_AMP_Vimeo_Shortcode', 'filter_shortcode' ] );
+
+		// With the filter added, this filter should return false.
+		$this->assertTrue( $embed->is_amp_shortcode_available_in_jetpack( 'vimeo' ) );
+		$this->assertFalse( $embed->is_amp_shortcode_available_in_jetpack( 'wrongshortcode' ) );
+	}
 }