Merge pull request ampproject#7612 from ampproject/remove/gyfcat-embe…

…ds-support Remove gyfcat embed support
rtCamp · Sep 5, 2023 · bcbb45e · bcbb45e
2 parents b7a1e1f + 85f1a8a
commit bcbb45e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 224 deletions.
diff --git a/includes/amp-helper-functions.php b/includes/amp-helper-functions.php
@@ -998,6 +998,12 @@ function amp_register_default_scripts( $wp_scripts ) {
 			$version = $extension_spec['latest'];
 		}
 
+		// Skip registering the amp-gfycat extension.
+		// @TODO: Remove this once the amp-gfycat extension is removed from spec.
+		if ( 'amp-gfycat' === $extension_name ) {
+			continue;
+		}
+
 		$src = sprintf(
 			'https://cdn.ampproject.org/v0/%s-%s.js',
 			$extension_name,
@@ -1408,7 +1414,6 @@ function amp_get_content_embed_handlers( $post = null ) {
 			AMP_TikTok_Embed_Handler::class       => [],
 			AMP_Tumblr_Embed_Handler::class       => [],
 			AMP_Gallery_Embed_Handler::class      => [],
-			AMP_Gfycat_Embed_Handler::class       => [],
 			AMP_Imgur_Embed_Handler::class        => [],
 			AMP_Scribd_Embed_Handler::class       => [],
 			AMP_WordPress_Embed_Handler::class    => [],

diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
diff --git a/includes/sanitizers/class-amp-style-sanitizer.php b/includes/sanitizers/class-amp-style-sanitizer.php
@@ -346,7 +346,6 @@ class AMP_Style_Sanitizer extends AMP_Base_Sanitizer {
 		'amp-brightcove',
 		'amp-dailymotion',
 		'amp-delight-player',
-		'amp-gfycat',
 		'amp-ima-video',
 		'amp-mowplayer',
 		'amp-nexxtv-player',

diff --git a/tests/php/test-amp-helper-functions.php b/tests/php/test-amp-helper-functions.php
@@ -1543,7 +1543,6 @@ public function test_amp_register_default_scripts_and_styles() {
 			'amp-fx-collection'            => 'v0/amp-fx-collection-0.1.js',
 			'amp-fx-flying-carpet'         => 'v0/amp-fx-flying-carpet-0.1.js',
 			'amp-geo'                      => 'v0/amp-geo-0.1.js',
-			'amp-gfycat'                   => 'v0/amp-gfycat-0.1.js',
 			'amp-gist'                     => 'v0/amp-gist-0.1.js',
 			'amp-google-document-embed'    => 'v0/amp-google-document-embed-0.1.js',
 			'amp-google-read-aloud-player' => 'v0/amp-google-read-aloud-player-0.1.js',
@@ -1714,7 +1713,6 @@ public function test_amp_register_default_scripts_and_styles_with_bento() {
 			'amp-fx-collection'            => 'v0/amp-fx-collection-0.1.js',
 			'amp-fx-flying-carpet'         => 'v0/amp-fx-flying-carpet-0.1.js',
 			'amp-geo'                      => 'v0/amp-geo-0.1.js',
-			'amp-gfycat'                   => 'v0/amp-gfycat-0.1.js',
 			'amp-gist'                     => 'v0/amp-gist-0.1.js',
 			'amp-google-document-embed'    => 'v0/amp-google-document-embed-0.1.js',
 			'amp-google-read-aloud-player' => 'v0/amp-google-read-aloud-player-0.1.js',

diff --git a/tests/php/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php
diff --git a/tests/php/test-tag-and-attribute-sanitizer.php b/tests/php/test-tag-and-attribute-sanitizer.php
@@ -965,12 +965,6 @@ static function () {
 				[ 'amp-form' ],
 			],
 
-			'gfycat'                                       => [
-				'<amp-gfycat data-gfyid="BareSecondaryFlamingo" width="225" height="400"></amp-gfycat>',
-				'<amp-gfycat data-gfyid="BareSecondaryFlamingo" width="225" height="400"></amp-gfycat>',
-				[ 'amp-gfycat' ],
-			],
-
 			'h2'                                           => [
 				'<h2>Example Text</h2>',
 			],