Update jetpack 8.0

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 99 insertions, 4 deletions

diff --git a/plugins/jetpack/3rd-party/class.jetpack-amp-support.php b/plugins/jetpack/3rd-party/class.jetpack-amp-support.php
index 27f22d1b..4a2d0a85 100644
--- a/plugins/jetpack/3rd-party/class.jetpack-amp-support.php
+++ b/plugins/jetpack/3rd-party/class.jetpack-amp-support.php
@@ -1,4 +1,7 @@
 <?php //phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
+
+use Automattic\Jetpack\Sync\Functions;
+
 /**
  * Manages compatibility with the amp-wp plugin
  *
@@ -7,7 +10,7 @@
 class Jetpack_AMP_Support {
 
 	/**
-	 * Apply custom AMP changes onthe frontend.
+	 * Apply custom AMP changes on the front-end.
 	 */
 	public static function init() {
 
@@ -21,6 +24,7 @@ class Jetpack_AMP_Support {
 
 		// Sharing.
 		add_filter( 'jetpack_sharing_display_markup', array( 'Jetpack_AMP_Support', 'render_sharing_html' ), 10, 2 );
+		add_filter( 'sharing_enqueue_scripts', array( 'Jetpack_AMP_Support', 'amp_disable_sharedaddy_css' ) );
 
 		// enforce freedom mode for videopress.
 		add_filter( 'videopress_shortcode_options', array( 'Jetpack_AMP_Support', 'videopress_enable_freedom_mode' ) );
@@ -33,6 +37,9 @@ class Jetpack_AMP_Support {
 
 		// Add post template metadata for legacy AMP.
 		add_filter( 'amp_post_template_metadata', array( 'Jetpack_AMP_Support', 'amp_post_template_metadata' ), 10, 2 );
+
+		// Filter photon image args for AMP Stories.
+		add_filter( 'jetpack_photon_post_image_args', array( 'Jetpack_AMP_Support', 'filter_photon_post_image_args_for_stories' ), 10, 2 );
 	}
 
 	/**
@@ -129,7 +136,7 @@ class Jetpack_AMP_Support {
 	 */
 	private static function add_site_icon_to_metadata( $metadata ) {
 		$size          = 60;
-		$site_icon_url = class_exists( 'Jetpack_Sync_Functions' ) ? Jetpack_Sync_Functions::site_icon_url( $size ) : '';
+		$site_icon_url = class_exists( 'Automattic\\Jetpack\\Sync\\Functions' ) ? Functions::site_icon_url( $size ) : '';
 
 		if ( function_exists( 'blavatar_domain' ) ) {
 			$metadata['publisher']['logo'] = array(
@@ -338,11 +345,99 @@ class Jetpack_AMP_Support {
 			$sharing_link   .= '></amp-social-share>';
 			$sharing_links[] = $sharing_link;
 		}
-		return preg_replace( '#(?<=<div class="sd-content">).+?(?=</div>)#s', implode( '', $sharing_links ), $markup );
+
+		// Wrap AMP sharing buttons in container.
+		$markup = preg_replace( '#(?<=<div class="sd-content">).+?(?=</div>)#s', implode( '', $sharing_links ), $markup );
+
+		// Remove any lingering share-end list items.
+		$markup = str_replace( '<li class="share-end"></li>', '', $markup );
+
+		return $markup;
+	}
+
+	/**
+	 * Tells Jetpack not to enqueue CSS for share buttons.
+	 *
+	 * @param  bool $enqueue Whether or not to enqueue.
+	 * @return bool          Whether or not to enqueue.
+	 */
+	public static function amp_disable_sharedaddy_css( $enqueue ) {
+		if ( self::is_amp_request() ) {
+			$enqueue = false;
+		}
+
+		return $enqueue;
+	}
+
+	/**
+	 * Ensure proper Photon image dimensions for AMP Stories.
+	 *
+	 * @param array $args Array of Photon Arguments.
+	 * @param array $details {
+	 *     Array of image details.
+	 *
+	 *     @type string    $tag            Image tag (Image HTML output).
+	 *     @type string    $src            Image URL.
+	 *     @type string    $src_orig       Original Image URL.
+	 *     @type int|false $width          Image width.
+	 *     @type int|false $height         Image height.
+	 *     @type int|false $width_orig     Original image width before constrained by content_width.
+	 *     @type int|false $height_orig    Original Image height before constrained by content_width.
+	 *     @type string    $transform_orig Original transform before constrained by content_width.
+	 * }
+	 * @return array Args.
+	 */
+	public static function filter_photon_post_image_args_for_stories( $args, $details ) {
+		if ( ! is_singular( 'amp_story' ) ) {
+			return $args;
+		}
+
+		// Percentage-based dimensions are not allowed in AMP, so this shouldn't happen, but short-circuit just in case.
+		if ( false !== strpos( $details['width_orig'], '%' ) || false !== strpos( $details['height_orig'], '%' ) ) {
+			return $args;
+		}
+
+		$max_height = 1280; // See image size with the slug \AMP_Story_Post_Type::MAX_IMAGE_SIZE_SLUG.
+		$transform  = $details['transform_orig'];
+		$width      = $details['width_orig'];
+		$height     = $details['height_orig'];
+
+		// If height is available, constrain to $max_height.
+		if ( false !== $height ) {
+			if ( $height > $max_height && false !== $height ) {
+				$width  = ( $max_height * $width ) / $height;
+				$height = $max_height;
+			} elseif ( $height > $max_height ) {
+				$height = $max_height;
+			}
+		}
+
+		/*
+		 * Set a height if none is found.
+		 * If height is set in this manner and height is available, use `fit` instead of `resize` to prevent skewing.
+		 */
+		if ( false === $height ) {
+			$height = $max_height;
+			if ( false !== $width ) {
+				$transform = 'fit';
+			}
+		}
+
+		// Build array of Photon args and expose to filter before passing to Photon URL function.
+		$args = array();
+
+		if ( false !== $width && false !== $height ) {
+			$args[ $transform ] = $width . ',' . $height;
+		} elseif ( false !== $width ) {
+			$args['w'] = $width;
+		} elseif ( false !== $height ) {
+			$args['h'] = $height;
+		}
+
+		return $args;
 	}
 }
 
 add_action( 'init', array( 'Jetpack_AMP_Support', 'init' ), 1 );
 
 add_action( 'admin_init', array( 'Jetpack_AMP_Support', 'admin_init' ), 1 );
-