Update versions tested in Travis build matrix #1058
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,22 @@ | ||
| <?php | ||
| /** | ||
| * WPCOM-specific things. | ||
| * | ||
| * @todo Move this into Jetpack. See https://github.com/Automattic/amp-wp/issues/1021 | ||
| * @package AMP | ||
| */ | ||
|
|
||
| add_action( 'pre_amp_render_post', 'jetpack_amp_disable_the_content_filters' ); | ||
|
|
||
| // Disable admin menu. | ||
| add_filter( 'amp_options_menu_is_enabled', '__return_false', 9999 ); | ||
|
|
||
| /** | ||
| * Disable the_content filters for Jetpack. | ||
| * | ||
| * @since 0.3 | ||
| */ | ||
| function jetpack_amp_disable_the_content_filters() { | ||
| add_filter( 'post_flair_disable', '__return_true', 99 ); | ||
| add_filter( 'videopress_show_2015_player', '__return_true' ); | ||
| add_filter( 'protected_embeds_use_form_post', '__return_false' ); | ||
|
|
@@ -24,14 +29,27 @@ function jetpack_amp_disable_the_content_filters( $post_id ) { | |
|
|
||
| add_action( 'amp_post_template_head', 'jetpack_amp_add_og_tags' ); | ||
|
|
||
| /** | ||
| * Add Open Graph tags. | ||
| * | ||
| * @since 0.3 | ||
| */ | ||
| function jetpack_amp_add_og_tags() { | ||
| if ( function_exists( 'jetpack_og_tags' ) ) { | ||
| jetpack_og_tags(); | ||
| } | ||
| } | ||
|
|
||
| add_filter( 'amp_post_template_metadata', 'jetpack_amp_post_template_metadata', 10, 2 ); | ||
|
|
||
| /** | ||
| * Add publisher and image metadata. | ||
| * | ||
| * @param array $metadata Metadata array. | ||
| * @param WP_Post $post Post. | ||
| * | ||
| * @return array Modified metadata array. | ||
| */ | ||
| function jetpack_amp_post_template_metadata( $metadata, $post ) { | ||
| if ( isset( $metadata['publisher'] ) && ! isset( $metadata['publisher']['logo'] ) ) { | ||
| $metadata = wpcom_amp_add_blavatar_to_metadata( $metadata, $post ); | ||
|
There was a problem hiding this comment. It'd probably be good to remove the second There was a problem hiding this comment. Good catch. Fixed in f683d9f. |
||
|
|
@@ -44,33 +62,51 @@ function jetpack_amp_post_template_metadata( $metadata, $post ) { | |
| return $metadata; | ||
| } | ||
|
|
||
| /** | ||
| * Add blavatar to metadata. | ||
| * | ||
| * @since 0.3 | ||
| * | ||
| * @param array $metadata Metadata. | ||
| * @return array Metadata. | ||
| */ | ||
| function wpcom_amp_add_blavatar_to_metadata( $metadata ) { | ||
| if ( ! function_exists( 'blavatar_domain' ) ) { | ||
| return $metadata; | ||
| } | ||
|
|
||
| $size = 60; | ||
|
|
||
| $metadata['publisher']['logo'] = array( | ||
| '@type' => 'ImageObject', | ||
| 'url' => blavatar_url( blavatar_domain( site_url() ), 'img', $size, staticize_subdomain( 'https://wordpress.com/i/favicons/apple-touch-icon-60x60.png' ) ), | ||
| 'width' => $size, | ||
| 'height' => $size, | ||
| ); | ||
|
|
||
| return $metadata; | ||
| } | ||
|
|
||
| /** | ||
| * Add image to metadata. | ||
| * | ||
| * @since 0.3.2 | ||
| * | ||
| * @param array $metadata Metadata. | ||
| * @param WP_Post $post Post. | ||
| * @return array Metadata. | ||
| */ | ||
| function wpcom_amp_add_image_to_metadata( $metadata, $post ) { | ||
| if ( ! class_exists( 'Jetpack_PostImages' ) ) { | ||
| return wpcom_amp_add_fallback_image_to_metadata( $metadata ); | ||
| } | ||
|
|
||
| $image = Jetpack_PostImages::get_image( $post->ID, array( | ||
| 'fallback_to_avatars' => true, | ||
| 'avatar_size' => 200, | ||
| // AMP already attempts these. | ||
| 'from_thumbnail' => false, | ||
| 'from_attachment' => false, | ||
| ) ); | ||
|
|
||
| if ( empty( $image ) ) { | ||
|
|
@@ -80,74 +116,103 @@ function wpcom_amp_add_image_to_metadata( $metadata, $post ) { | |
| if ( ! isset( $image['src_width'] ) ) { | ||
| $dimensions = wpcom_amp_extract_image_dimensions_from_getimagesize( array( | ||
| $image['src'] => false, | ||
| ) ); | ||
|
|
||
| if ( false !== $dimensions[ $image['src'] ] ) { | ||
| $image['src_width'] = $dimensions['width']; | ||
| $image['src_height'] = $dimensions['height']; | ||
| } | ||
| } | ||
|
|
||
| $metadata['image'] = array( | ||
| '@type' => 'ImageObject', | ||
| 'url' => $image['src'], | ||
| 'width' => $image['src_width'], | ||
| 'height' => $image['src_height'], | ||
| ); | ||
|
|
||
| return $metadata; | ||
| } | ||
|
|
||
| /** | ||
| * Add fallback image to metadata. | ||
| * | ||
| * @since 0.3.2 | ||
| * | ||
| * @param array $metadata Metadata. | ||
| * @return array Metadata. | ||
| */ | ||
| function wpcom_amp_add_fallback_image_to_metadata( $metadata ) { | ||
| $metadata['image'] = array( | ||
| '@type' => 'ImageObject', | ||
| 'url' => staticize_subdomain( 'https://wordpress.com/i/blank.jpg' ), | ||
| 'width' => 200, | ||
| 'height' => 200, | ||
| ); | ||
|
|
||
| return $metadata; | ||
| } | ||
|
|
||
| add_action( 'amp_extract_image_dimensions_batch_callbacks_registered', 'wpcom_amp_extract_image_dimensions_batch_add_custom_callbacks' ); | ||
|
|
||
| /** | ||
| * Add hooks to extract image dimensions. | ||
| * | ||
| * @since 0.5 | ||
| */ | ||
| function wpcom_amp_extract_image_dimensions_batch_add_custom_callbacks() { | ||
| // If images are being served from Photon or WP.com files, try extracting the size using querystring. | ||
| add_action( 'amp_extract_image_dimensions_batch', 'wpcom_amp_extract_image_dimensions_from_querystring', 9, 1 ); // Hook in before the default extractors. | ||
|
|
||
| // Uses a special wpcom lib (wpcom_getimagesize) to extract dimensions as a last resort if we weren't able to figure them out. | ||
| add_action( 'amp_extract_image_dimensions_batch', 'wpcom_amp_extract_image_dimensions_from_getimagesize', 99, 1 ); // Our last resort, so run late. | ||
|
|
||
| // The wpcom override obviates this one, so take it out. | ||
| remove_filter( 'amp_extract_image_dimensions_batch', array( 'AMP_Image_Dimension_Extractor', 'extract_by_downloading_images' ), 999 ); | ||
| } | ||
|
|
||
| /** | ||
| * Extract image dimensions from query string. | ||
| * | ||
| * @since 0.5 | ||
| * | ||
| * @param array $dimensions Dimensions. | ||
| * @return array Dimensions. | ||
| */ | ||
| function wpcom_amp_extract_image_dimensions_from_querystring( $dimensions ) { | ||
| foreach ( $dimensions as $url => $value ) { | ||
|
|
||
| if ( is_array( $value ) ) { | ||
| continue; | ||
| } | ||
|
|
||
| $host = wp_parse_url( $url, PHP_URL_HOST ); | ||
| if ( ! wp_endswith( $host, '.wp.com' ) || ! wp_endswith( $host, '.files.wordpress.com' ) ) { | ||
| continue; | ||
| } | ||
|
|
||
| parse_str( wp_parse_url( $url, PHP_URL_QUERY ), $query ); | ||
| $w = isset( $query['w'] ) ? absint( $query['w'] ) : false; | ||
| $h = isset( $query['h'] ) ? absint( $query['h'] ) : false; | ||
|
|
||
| if ( false !== $w && false !== $h ) { | ||
| $dimensions[ $url ] = array( | ||
| 'width' => $w, | ||
| 'height' => $h, | ||
| ); | ||
| } | ||
| } | ||
| return $dimensions; | ||
| } | ||
|
|
||
| /** | ||
| * Extract image dimensions via wpcom/imagesize. | ||
| * | ||
| * @since 0.5 | ||
| * | ||
| * @param array $dimensions Dimensions. | ||
| * @return array Dimensions. | ||
| */ | ||
| function wpcom_amp_extract_image_dimensions_from_getimagesize( $dimensions ) { | ||
| if ( ! function_exists( 'require_lib' ) ) { | ||
| return $dimensions; | ||
|
|
@@ -161,7 +226,7 @@ function wpcom_amp_extract_image_dimensions_from_getimagesize( $dimensions ) { | |
| $result = wpcom_getimagesize( $url ); | ||
| if ( is_array( $result ) ) { | ||
| $dimensions[ $url ] = array( | ||
| 'width' => $result[0], | ||
| 'height' => $result[1], | ||
| ); | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice additions of DocBlocks and improvements in coding style here.