Force videopress to use html5 player for AMP #1125

yurynix · 2018-05-07T06:56:49Z

Videopress embed uses an iframe and a script tag,
script tag is not allowed in AMP, so it's stripped and a warning is generated.

This PR tries to force html5 player, so the player would be actually a <video /> tag
that would be converted to <amp-video />.

yurynix · 2018-05-07T09:18:02Z

Despite the code in this PR, I still see the validation warning, I'm not sure why...

yurynix · 2018-05-07T10:13:24Z

Ok, got it, it's because of this validation, so shortcodes are processed, but there is no way to hook to it for allowing modification for AMP.

Maybe do_action( 'pre_amp_render_post', $post_id ); ?

westonruter

Note: Eventually the Jetpack-specific code will be merged into Jetpack code itself per #1021.

westonruter · 2018-05-07T17:29:49Z

jetpack-helper.php

+}
+
+if ( isset( $_GET[ AMP_Validation_Utils::VALIDATE_QUERY_VAR ] ) ) { // WPCS: CSRF ok.
+	add_filter( 'videopress_shortcode_options', 'amp_videopress_enable_freedom_mode' );


This shouldn't be necessary now that you have b6a4671 right?

westonruter · 2018-05-07T17:30:49Z

includes/utils/class-amp-validation-utils.php

@@ -590,6 +590,7 @@ public static function print_edit_form_validation_status( $post ) {

 		// If no results from URL are available, validate post content outside frontend context.
 		if ( empty( $validation_errors ) && post_type_supports( $post->post_type, 'editor' ) ) {
+			do_action( 'pre_amp_render_post', $post->ID );


This should have the phpdoc added to it on the line before:

/** This action is documented in amp.php */

westonruter

To ensure that this change applies when amp theme support is present, there should be also something like this:

add_action( 'template_redirect', function() {
    if ( is_amp_endpoint() ) {
        amp_jetpack_mods();
    }
}, 9 );

This could be used instead of the pre_amp_render_post action.

yurynix · 2018-05-07T18:06:06Z

@westonruter Thank you for the review, I'll address your comments tomorrow unless someone beats me to it.

I'm not really clear what you meant by your comment here though:
#1125 (review)

Why hooking to template_redirect action is better than pre_amp_render_post?
Sorry if that's obvious, It's my first time around that repo.

westonruter · 2018-05-07T18:30:27Z

@yurynix In v0.7 we've added amp theme support where you can have the entire theme be served as AMP, not just the post templates. For example, you could have your blog index template be served as AMP now (see example site: https://ampdemo.xwp.io/). In that case, there is no $post to be passed as the arg for the pre_amp_render_post action. But you can see from the source that the pre_amp_render_post action actually runs at template_redirect (priority 10) anyway:

https://github.com/Automattic/amp-wp/blob/7439d2ab5eebd0ee071749a849fda946a2eff4be/amp.php#L326-L383

So by doing amp_jetpack_mods() at template_redirect priority 9, then this ensures that the mods are present whether WordPress is serving the old AMP post templates or whether amp theme support is present.

westonruter · 2018-05-07T18:36:27Z

@yurynix also, you may want to rebase your commits onto the 0.7 branch so that the changes could be included in 0.7.1.

westonruter · 2018-05-08T00:43:54Z

includes/utils/class-amp-validation-utils.php

@@ -590,6 +590,7 @@ public static function print_edit_form_validation_status( $post ) {

 		// If no results from URL are available, validate post content outside frontend context.
 		if ( empty( $validation_errors ) && post_type_supports( $post->post_type, 'editor' ) ) {
+			do_action( 'pre_amp_render_post', $post->ID );


Actually this changes can be reverted because this entire if statement is going to be removed in #1132

Just saw that now, we can drop my last 2 commits, sorry for the noise.

…post

…_render_post" This reverts commit 658377b.

…pport * Remove obsolete filter addition for videopress_shortcode_options when validate query var is present. * Add missing phpdoc. * Clean up phpcs issues.

westonruter · 2018-05-08T00:55:40Z

@yurynix I've rebased onto 0.7 so please reset your branch to the remote. I've also made the changes I described. Please test to confirm it works as expected.

See #995, #1002

yurynix · 2018-05-08T08:20:36Z

Thank you for all the explanation and the work here @westonruter .
I've taken it to a spin now, and while it indeed generates the html5 player on AMP page,
the issue of the editor warning is still present.

This is caused because of the code that validates the output don't call redirect_template action, it only registers content embed handlers.

Which may be this workaround should be, a content embed handler, so I've pushed a commit to do just that, ideally, it should live in the Jetpack plugin with the rest of the workarounds.

…orce-videopress-use-html5

westonruter · 2018-05-09T14:24:52Z

@yurynix I dropped your two commits as requested, and I merged 0.7 into this branch. Could you confirm it works as expected now?

yurynix · 2018-05-10T08:10:11Z

I've tested it and it works great 👍
Thanks.

yurynix added Integration: Jetpack Validation wp-core-feature labels May 7, 2018

yurynix changed the title ~~[WIP] Force videopress to use html5 player for AMP~~ Force videopress to use html5 player for AMP May 7, 2018

yurynix requested a review from mjangda May 7, 2018 11:18

westonruter reviewed May 7, 2018

View reviewed changes

westonruter requested changes May 7, 2018

View reviewed changes

westonruter mentioned this pull request May 7, 2018

Deprecate the pre_amp_render_post action (when AMP theme support is present) #1129

Closed

westonruter reviewed May 8, 2018

View reviewed changes

yurynix and others added 7 commits May 7, 2018 17:44

Force videopress to use html5 player for AMP

23283e4

Only force videopress html5 player when in pre_amp_render_post

c5cd1d1

Moved the filter to jetpack-helper

0240bb3

CSRF ok

b709b73

Force all shortcode plugins to adjust to AM by firing pre_amp_render_…

658377b

…post

Revert "Force all shortcode plugins to adjust to AM by firing pre_amp…

b19b869

…_render_post" This reverts commit 658377b.

Call amp_jetpack_mods() at template_redirect for sake of amp theme su…

145991d

…pport * Remove obsolete filter addition for videopress_shortcode_options when validate query var is present. * Add missing phpdoc. * Clean up phpcs issues.

westonruter force-pushed the add/force-videopress-use-html5 branch from b6a4671 to 145991d Compare May 8, 2018 00:54

westonruter changed the base branch from develop to 0.7 May 8, 2018 00:54

westonruter approved these changes May 8, 2018

View reviewed changes

westonruter added this to the v0.7.1 milestone May 8, 2018

Merge jetpack-helper.php changes from develop

db95c09

See #995, #1002

Merge branch '0.7' of https://github.com/Automattic/amp-wp into add/f…

3903e1a

…orce-videopress-use-html5

westonruter force-pushed the add/force-videopress-use-html5 branch from d7668fb to 3903e1a Compare May 9, 2018 14:23

westonruter merged commit 4dd1023 into 0.7 May 10, 2018

westonruter deleted the add/force-videopress-use-html5 branch May 10, 2018 14:19

swissspidy added Integration: WP Core and removed wp-core-feature labels Sep 18, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Force videopress to use html5 player for AMP #1125

Force videopress to use html5 player for AMP #1125

yurynix commented May 7, 2018 •

edited

Loading

yurynix commented May 7, 2018

yurynix commented May 7, 2018

westonruter left a comment

westonruter May 7, 2018

westonruter May 7, 2018

westonruter left a comment •

edited

Loading

yurynix commented May 7, 2018

westonruter commented May 7, 2018

westonruter commented May 7, 2018

westonruter May 8, 2018

yurynix May 8, 2018

westonruter commented May 8, 2018

yurynix commented May 8, 2018

westonruter commented May 9, 2018

yurynix commented May 10, 2018

Force videopress to use html5 player for AMP #1125

Force videopress to use html5 player for AMP #1125

Conversation

yurynix commented May 7, 2018 • edited Loading

yurynix commented May 7, 2018

yurynix commented May 7, 2018

westonruter left a comment

Choose a reason for hiding this comment

westonruter May 7, 2018

Choose a reason for hiding this comment

westonruter May 7, 2018

Choose a reason for hiding this comment

westonruter left a comment • edited Loading

Choose a reason for hiding this comment

yurynix commented May 7, 2018

westonruter commented May 7, 2018

westonruter commented May 7, 2018

westonruter May 8, 2018

Choose a reason for hiding this comment

yurynix May 8, 2018

Choose a reason for hiding this comment

westonruter commented May 8, 2018

yurynix commented May 8, 2018

westonruter commented May 9, 2018

yurynix commented May 10, 2018

yurynix commented May 7, 2018 •

edited

Loading

westonruter left a comment •

edited

Loading