Update amp-instagram embed regex (#4053)

* Update amp-instagram embed regex * Add test for raw embed
ampproject · Jan 10, 2020 · 9c3a6c7 · 9c3a6c7
1 parent 6e6c34f
commit 9c3a6c7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/includes/embeds/class-amp-instagram-embed.php b/includes/embeds/class-amp-instagram-embed.php
@@ -14,7 +14,7 @@
  */
 class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	const SHORT_URL_HOST = 'instagr.am';
-	const URL_PATTERN    = '#http(s?)://(www\.)?instagr(\.am|am\.com)/p/([^/?]+)#i';
+	const URL_PATTERN    = '#https?:\/\/(www\.)?instagr(\.am|am\.com)\/(p|tv)\/([A-Za-z0-9-_]+)#i';
 
 	/**
 	 * Default width.

diff --git a/tests/php/test-amp-instagram-embed.php b/tests/php/test-amp-instagram-embed.php
@@ -3,18 +3,26 @@
 class AMP_Instagram_Embed_Test extends WP_UnitTestCase {
 	public function get_conversion_data() {
 		return [
-			'no_embed'   => [
+			'no_embed'      => [
 				'<p>Hello world.</p>',
 				'<p>Hello world.</p>' . PHP_EOL,
 			],
-			'simple_url' => [
+			'simple_url'    => [
 				'https://instagram.com/p/7-l0z_p4A4/' . PHP_EOL,
 				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
 			],
-			'short_url'  => [
+			'simple_tv_url' => [
+				'https://instagram.com/tv/7-l0z_p4A4/' . PHP_EOL,
+				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+			],
+			'short_url'     => [
 				'https://instagr.am/p/7-l0z_p4A4' . PHP_EOL,
 				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
 			],
+			'short_tv_url'  => [
+				'https://instagr.am/tv/7-l0z_p4A4' . PHP_EOL,
+				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+			],
 		];
 	}
 
@@ -95,6 +103,11 @@ public function get_raw_embed_dataset() {
 				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . "\n\n",
 			],
 
+			'blockquote_tv_embed'                    => [
+				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/tv/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . "\n\n",
+			],
+
 			'blockquote_embed_notautop'              => [
 				'<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
 				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram> ',