Remove handling of Jetpack shortcodes #3678

kienstra · 2019-10-31T23:00:00Z

Summary

This plugin's handling of Jetpack shortcodes, like [vimeo] and [tweet], is possibly being moved to Jetpack.

So this PR looks for the presence of a new filter that Jetpack should have. If that's present, this plugin doesn't run the logic for that shortcode.

Related to #3309

Checklist

My pull request is addressing an open issue (please create one otherwise).
My code is tested and passes existing tests. (It's not really tested, but it's almost entirely deletions. So I don't think more tests are needed.)
My code follows the Engineering Guidelines (updates are often made to the guidelines, check it out periodically).

This looks for the presence of the new filter that Jetpack should have, at least in the current state of the PR.

This class needed to be renamed becase of a Code Climate report.

It's now in a different class and method.

This will allow checking for whether Jetpack already supports AMP for the shortcode, for any shortcode passed to the function.

If there is support in Jetpack, there's no need for the AMP plugin logic to run.

Like the other shortcodes, this could possibly be moved to Jetpack.

westonruter · 2019-11-04T03:48:32Z

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

-		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 ) ) {


Instead of this method, wouldn't it be the same to just do ! class_exists( 'Jetpack_AMP_Soundcloud_Shortcode' )? This code will quickly become dead code that should be removed entirely from the AMP plugin, once a new version of Jetpack has been released, so we don't need to worry too much about keeping this code around too long.

Sure, b64392b checks whether the class exists.

westonruter · 2019-11-04T03:49:57Z

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

-			// @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' ] );


Please mark the shortcode methods as @deprecated.

Sure, 3e0e649 does that.

westonruter · 2019-11-04T03:51:06Z

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

@@ -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 ) ) {


See notes above for Soundcloud.

Sure, applied in b64392b

westonruter · 2019-11-04T03:51:25Z

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

@@ -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 ) ) {


See notes above for Soundcloud.

Sure, b64392b changes this

westonruter · 2019-11-04T03:51:56Z

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

+	 * @inheritDoc
+	 */
+	public function tearDown() {
+		remove_all_filters( 'do_shortcode_tag' );


I believe this isn't necessary because filters get reset after each test anyway.

OK, sounds good.

3e0e649#diff-58db4548e89d6f4290514ec825c906ecL15 removes this tearDown() method.

westonruter · 2019-11-04T03:52:28Z

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

+	 *
+	 * @covers AMP_Base_Embed_Handler::is_amp_shortcode_available_in_jetpack()
+	 */
+	public function test_is_amp_shortcode_available_in_jetpack() {


This test may not be necessary. I think we can rather just check if the Jetpack_AMP_Vimeo_Shortcode class exists.

As Weston suggested, it's possible to do this with a simple class_exsts() call.

This should be more descriptive. Also, delete the remove_all_filters() call.

…nction Instead of class method, this now uses a plain function.

The function name is no jetpack_amp_vimeo_shortcode in Automattic/jetpack#13921

@deprecated

The PR to migrate [vimeo] shortcode has changed: https://github.com/Automattic/jetpack/pull/13921/files So change the function_exists() check and the @deprecated tag.

This is being moved to Jetpack, though the actual function name might change.

There's now a new function, jetpack_amp_soundcloud_shortcode(), instead of the previous class.

…ortcode For the current Jetpack migration, this shouldn't be needed.

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

Also, change the deprecated tag to match the new function name.

This is being moved to Jetpack, so there shouldn't be a need for it here.

This is being moved to Jetpack, so delete the add_shortcode() and remove_shortcode() calls.

jeherve · 2019-11-19T14:32:05Z

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

+	 *
+	 * @var string
+	 */
+	const SHORTCODE_TAG = 'vimeo';


This should probably be tweet.

Ah, good point.

Addressed in ec5257e. It turns out that the constant wasn't needed at all 😄

westonruter · 2019-11-20T20:33:42Z

Excellent. Let's snooze this issue until 8.0.0 is released.

…meo-shortocode-support * 'develop' of github.com:ampproject/amp-wp: (159 commits) Return allowed KSES tags if not an array (#3879) Update dependency @wordpress/date to v3.6.0 (#3739) Update dependency @babel/plugin-proposal-object-rest-spread to… (#3813) Update dependency @babel/core to v7.7.4 (#3686) Update dependency @wordpress/api-fetch to v3.7.0 (#3731) Update dependency @wordpress/keycodes to v2.7.0 (#3745) Bundle common font files for externalizing data: URLs (#3866) Update dependency css-loader to v3.2.1 (#3870) Update dependency core-js to v3.4.7 (#3873) Update dependency core-js to v3.4.5 (#3695) Update dependency eslint-plugin-react to v7.17.0 (#3845) Update dependency eslint-plugin-jest to v23.1.1 (#3702) Update dependency eslint to v6.7.2 (#3811) Update dependency autoprefixer to v9.7.3 (#3850) Update dependency browserslist to v4.8.0 (#3849) Remove second sentence from paired browsing dialog Add async attribute to amp-paired-browsing-client script Restrict paired browsing to when dev mode is enabled Add robots noindex/nofollow meta tag in paired browsing app Remove extraneous method in favor of (temporary) closure ...

westonruter

@kienstra I found some references to removed shortcode methods which I removed in e168813. However, there is one left which needs some more work from you, namely AMP_Vimeo_Embed_Handler::video_override(). The shortcode method may need to be restored in this case, as Vimeo actually is something that core directly supports for the video shortcode.

Please also check for YouTube.

westonruter · 2019-12-04T10:47:47Z

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

@@ -51,7 +51,6 @@ public function __construct( $args = [] ) {
 	 */
 	public function register_embed() {
 		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
-		add_shortcode( 'youtube', [ $this, 'shortcode' ] ); // @todo Deprecated. See <https://github.com/ampproject/amp-wp/issues/3309>.
 		add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10, 2 );


This video_override method needs to be restored.

Ah, good point. I'll do that.

It's restored in 5097040

There were conflicts in: includes/embeds/class-amp-twitter-embed-handler.php tests/php/test-amp-twitter-embed.php These were trivial.

kienstra · 2019-12-04T16:56:17Z

It looks like I didn't resolve the conflicts very well.

This was removed in: 4b39169 Apparently, I didn't resolve the merge conflict very well.

There probably wasn't a reason to edit AMP_Twitter_Embed_Handler::oembed() so revert that.

As Weston mentioned, this is a filter callback, and can't be deleted.

This is called by another deprecated method: oembed(). So keep this for now.

That method called shortcode(), so simply move the needed parts of shortcode() into video_override().

shortcode() was deleted, so instead of restoring it, copy the needed logic.

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

kienstra · 2019-12-04T19:09:26Z

However, there is one left which needs some more work from you, namely AMP_Vimeo_Embed_Handler::video_override()

Good catch. That method's call of shortcode() is now replaced with the small amount of logic from shortcode() that it used.

kienstra · 2019-12-04T19:11:36Z

The [video] shortcodes for YouTube and Vimeo work again.

For example:

[video src="https://www.youtube.com/watch?v=NeXQEJNWO5w"]
[video src="https://vimeo.com/45879568"]

To follow the latest convention in the plugin, align these.

westonruter · 2019-12-05T03:33:29Z

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

+	 * @param array $matches URL pattern matches.
 	 * @return string Rendered oEmbed.
 	 */
-	public function oembed() {
+	public function oembed( $matches ) {
 		_deprecated_function( __METHOD__, '1.1' );
-		return '';
+		$id = false;
+
+		if ( isset( $matches['tweet'] ) && is_numeric( $matches['tweet'] ) ) {
+			$id = $matches['tweet'];
+		}
+
+		if ( ! $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'],
+			]
+		);


I don't think we need this method anymore, do we? Can't it just be emptied out, as I did in: e168813

/** * 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() * * @return string Rendered oEmbed. */ public function oembed() { _deprecated_function( __METHOD__, '1.1' ); return ''; }

Actually, we might as well just remove it entirely, and it is not being used. It has been deprecated since 1.1.

Good point, it's now removed in 6ae3419.

westonruter · 2019-12-05T03:35:03Z

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

+	/**
+	 * Gets AMP-compliant markup for the YouTube shortcode.
+	 *
+	 * @deprecated 1.5.0 This was moved to Jetpack, in jetpack_amp_youtube_shortcode().
+	 *
+	 * @param array $attr The YouTube attributes.
+	 * @return string YouTube shortcode markup.
+	 */
+	public function shortcode( $attr ) {
+		_deprecated_function( __METHOD__, '1.5.0' );
+		$url = false;
+
+		if ( isset( $attr[0] ) ) {
+			$url = ltrim( $attr[0], '=' );
+		} elseif ( function_exists( 'shortcode_new_to_old_params' ) ) {
+			$url = shortcode_new_to_old_params( $attr );
+		}
+
+		if ( empty( $url ) ) {
+			return '';
+		}
+
+		$video_id = $this->get_video_id_from_url( $url );
+
+		return $this->render( compact( 'video_id' ), $url );
+	}
+
 	/**
 	 * Render oEmbed.
 	 *
 	 * @see \WP_Embed::shortcode()
 	 * @deprecated This is no longer being used.
 	 *
+	 * @param array  $matches URL pattern matches.
+	 * @param array  $attr    Shortcode attribues.
+	 * @param string $url     URL.
 	 * @return string Rendered oEmbed.
 	 */
-	public function oembed() {
+	public function oembed( $matches, $attr, $url ) {
+		unset( $matches, $attr );
 		_deprecated_function( __METHOD__, '1.5.0' );
-		return '';
+
+		return $this->shortcode( [ $url ] );
 	}


Since these methods aren't used anymore, can't they just be made to return an empty string while having the _deprecated_function() calls?

We might as well just remove them altogether because they aren't being used.

Good point, 4726922 removes AMP_YouTube_Embed_Handler::shortcode() and oembed(), as they're not used anywhere.

westonruter · 2019-12-05T03:35:24Z

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

+	 * @param array $matches URL pattern matches.
 	 * @return string Rendered oEmbed.
 	 */
-	public function oembed() {
+	public function oembed( $matches ) {
 		_deprecated_function( __METHOD__, '1.1' );
-		return '';
+		$id = false;
+
+		if ( isset( $matches['tweet'] ) && is_numeric( $matches['tweet'] ) ) {
+			$id = $matches['tweet'];
+		}
+
+		if ( ! $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'],
+			]
+		);


Actually, we might as well just remove it entirely, and it is not being used. It has been deprecated since 1.1.

As Weston mentioned, this has been deprecated since v1.1.

As Weston mentioned, these aren't being used and can be deleted.

…a97571

Add a way to deprecate the AMP plugin's handling of Vimeo shortcode

9436ac2

This looks for the presence of the new filter that Jetpack should have, at least in the current state of the PR.

googlebot added the cla: yes Signed the Google CLA label Oct 31, 2019

This was referenced Oct 31, 2019

Migrate the vimeo shortcode AMP logic from the AMP plugin kienstra/jetpack#1

Closed

Migrate the vimeo shortcode AMP logic to Jetpack from the AMP plugin Automattic/jetpack#13921

Merged

kienstra added 5 commits October 31, 2019 18:21

Change the name of the class, as it changed in the Jetpack PR

73b8b10

This class needed to be renamed becase of a Code Climate report.

Change the name of the filter again, as it changed in the Jetpack PR

5ceb39b

It's now in a different class and method.

Allow using the helper function in any embed handler

26a22c7

This will allow checking for whether Jetpack already supports AMP for the shortcode, for any shortcode passed to the function.

Use the helper function before adding the [tweet] shortcode

92d9de1

If there is support in Jetpack, there's no need for the AMP plugin logic to run.

Merge branch 'develop' into update/vimeo-shortocode-support

a98f88c

kienstra changed the title ~~[WIP] Add a way to deprecate this plugin's handling of Vimeo shortcode~~ [WIP] Add a way to deprecate this plugin's handling of Jetpack shortcodes Nov 1, 2019

Also defer AMP [soundcloud] shortcode handling to Jetpack

85077be

Like the other shortcodes, this could possibly be moved to Jetpack.

westonruter requested changes Nov 4, 2019

View reviewed changes

kienstra added 6 commits November 4, 2019 16:25

Simplify check for whether Jetpack AMP shortocode is available

b64392b

As Weston suggested, it's possible to do this with a simple class_exsts() call.

Change @deprecated tag to be 'Moved to...'

3e0e649

This should be more descriptive. Also, delete the remove_all_filters() call.

Update the class_exists() call to funciton_exists(), as it's now a fu…

d0b73eb

…nction Instead of class method, this now uses a plain function.

Change function name to reflect the change in the Jetpack PR

0192ff5

The function name is no jetpack_amp_vimeo_shortcode in Automattic/jetpack#13921

Update the function names to reflect the latest in the PR

93cfaba

The PR to migrate [vimeo] shortcode has changed: https://github.com/Automattic/jetpack/pull/13921/files So change the function_exists() check and the @deprecated tag.

Deprecate this plugin's handling of the [youtube] shortcode

fcda766

This is being moved to Jetpack, though the actual function name might change.

kienstra mentioned this pull request Nov 11, 2019

Move AMP rendering of [youtube] shortcode to Jetpack from AMP plugin Automattic/jetpack#14010

Merged

kienstra added 2 commits November 12, 2019 23:59

Update the souncloud conditional for the new function

302d611

There's now a new function, jetpack_amp_soundcloud_shortcode(), instead of the previous class.

Remove add_shortcode() and remove_shortcode() for the [soundcloud] sh…

822ca4b

…ortcode For the current Jetpack migration, this shouldn't be needed.

kienstra mentioned this pull request Nov 14, 2019

Migrate some of the AMP [soundcloud] shortcode conversion to Jetpack Automattic/jetpack#14028

Merged

kienstra commented Nov 14, 2019

View reviewed changes

includes/embeds/class-amp-soundcloud-embed.php Outdated Show resolved Hide resolved

kienstra added 2 commits November 14, 2019 14:33

Remove the add_shortcode() and remove_shortcode() calls for [tweet]

a4bcd1b

Also, change the deprecated tag to match the new function name.

Deprecate the handling of the [instagram] shortcode

5d74750

This is being moved to Jetpack, so there shouldn't be a need for it here.

This was referenced Nov 15, 2019

Migrate to Jetpack the [instagram] shortcode AMP handling Automattic/jetpack#14053

Merged

Migrate the [tweet] shortcode AMP handling to Jetpack Automattic/jetpack#14054

Merged

Remove [dailymotion] shortcode handling and deprecate function

00b2e2c

This is being moved to Jetpack, so delete the add_shortcode() and remove_shortcode() calls.

kienstra mentioned this pull request Nov 16, 2019

Migrate the [dailymotion] shortcode AMP handling to Jetpack Automattic/jetpack#14055

Merged

jeherve suggested changes Nov 19, 2019

View reviewed changes

westonruter changed the title ~~[WIP] Remove this plugin's handling of Jetpack shortcodes~~ Remove AMP plugin's handling of Jetpack shortcodes Dec 4, 2019

westonruter changed the title ~~Remove AMP plugin's handling of Jetpack shortcodes~~ Remove handling of Jetpack shortcodes Dec 4, 2019

westonruter added this to the v1.5 milestone Dec 4, 2019

westonruter added 2 commits December 4, 2019 17:44

Remove call to removed method; update phpdoc

e168813

westonruter requested changes Dec 4, 2019

View reviewed changes

westonruter reviewed Dec 4, 2019

View reviewed changes

Merge in develop, resolve conflicts

1a4b700

There were conflicts in: includes/embeds/class-amp-twitter-embed-handler.php tests/php/test-amp-twitter-embed.php These were trivial.

kienstra added 6 commits December 4, 2019 11:04

Remove AMP_Twitter_Embed_Handler::filter_embed_oembed_html()

9f9c2ff

This was removed in: 4b39169 Apparently, I didn't resolve the merge conflict very well.

Correct an apparent error I made in resolving a merge conflict

2d5ae27

There probably wasn't a reason to edit AMP_Twitter_Embed_Handler::oembed() so revert that.

Restore AMP_YouTube_Embed_Handler::video_override()

5097040

As Weston mentioned, this is a filter callback, and can't be deleted.

Deprecate AMP_YouTube_Embed_Handler::shortcode()

b300e9d

This is called by another deprecated method: oembed(). So keep this for now.

Refactor AMP_Vimeo_Embed_Handler::shortcode() into video_override()

fdb463e

That method called shortcode(), so simply move the needed parts of shortcode() into video_override().

Replace a call to ->shortcode() with the logic from shortcode()

2d71b6b

shortcode() was deleted, so instead of restoring it, copy the needed logic.

kienstra commented Dec 4, 2019

View reviewed changes

includes/embeds/class-amp-youtube-embed-handler.php Show resolved Hide resolved

Align @param descriptions in test_video_override

ba51034

To follow the latest convention in the plugin, align these.

westonruter reviewed Dec 5, 2019

View reviewed changes

kienstra and others added 3 commits December 5, 2019 04:31

Delete AMP_Twitter_Embed_Handler::oembed()

6ae3419

As Weston mentioned, this has been deprecated since v1.1.

Delete AMP_YouTube_Embed_Handler::shortcode() and oembed()

4726922

As Weston mentioned, these aren't being used and can be deleted.

Remove unused AMP_YouTube_Embed_Handler::sanitize_v_arg method after 7…

19e05de

…a97571

westonruter approved these changes Dec 6, 2019

View reviewed changes

westonruter merged commit 6de46e0 into develop Dec 6, 2019

westonruter deleted the update/vimeo-shortocode-support branch December 6, 2019 03:53

westonruter added the Changelogged label Mar 23, 2020

westonruter mentioned this pull request Apr 1, 2020

YouTube videos with IDs containing hyphens fail to embed #4504

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove handling of Jetpack shortcodes #3678

Remove handling of Jetpack shortcodes #3678

kienstra commented Oct 31, 2019 •

edited

Loading

westonruter Nov 4, 2019

kienstra Nov 4, 2019

westonruter Nov 4, 2019

kienstra Nov 4, 2019

westonruter Nov 4, 2019

kienstra Nov 4, 2019

westonruter Nov 4, 2019

kienstra Nov 4, 2019

westonruter Nov 4, 2019

kienstra Nov 4, 2019

kienstra Nov 4, 2019

westonruter Nov 4, 2019

jeherve Nov 19, 2019

kienstra Nov 19, 2019

kienstra Nov 19, 2019

westonruter commented Nov 20, 2019

westonruter left a comment

westonruter Dec 4, 2019

kienstra Dec 4, 2019

kienstra Dec 4, 2019

kienstra commented Dec 4, 2019

kienstra commented Dec 4, 2019

kienstra commented Dec 4, 2019

westonruter Dec 5, 2019

westonruter Dec 5, 2019

kienstra Dec 5, 2019

westonruter Dec 5, 2019

kienstra Dec 5, 2019

westonruter Dec 5, 2019

Remove handling of Jetpack shortcodes #3678

Remove handling of Jetpack shortcodes #3678

Conversation

kienstra commented Oct 31, 2019 • edited Loading

Summary

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

westonruter commented Nov 20, 2019

westonruter left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kienstra commented Dec 4, 2019

kienstra commented Dec 4, 2019

kienstra commented Dec 4, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kienstra commented Oct 31, 2019 •

edited

Loading