Merge branch 'trunk' into add/ap-post-purge

Author: pfefferle

.github/changelog/2609-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add image optimization for imported attachments (resize to 1200px max, convert to WebP).

includes/class-attachments.php

@@ -27,6 +27,13 @@ class Attachments {
 	 */
 	public static $comments_dir = '/activitypub/comments/';
 
+	/**
+	 * Maximum width for imported images.
+	 *
+	 * @var int
+	 */
+	const MAX_IMAGE_DIMENSION = 1200;
+
 	/**
 	 * Initialize the class and set up filters.
 	 */
@@ -420,13 +427,14 @@ private static function save_attachment( $attachment_data, $post_id, $author_id
 			require_once ABSPATH . 'wp-admin/includes/image.php';
 		}
 
+		// Initialize filesystem.
+		\WP_Filesystem();
+		global $wp_filesystem;
+
 		$is_local = ! preg_match( '#^https?://#i', $attachment_data['url'] );
 
 		if ( $is_local ) {
 			// Read local file from disk.
-			\WP_Filesystem();
-			global $wp_filesystem;
-
 			if ( ! $wp_filesystem->exists( $attachment_data['url'] ) ) {
 				/* translators: %s: file path */
 				return new \WP_Error( 'file_not_found', sprintf( \__( 'File not found: %s', 'activitypub' ), $attachment_data['url'] ) );
@@ -444,27 +452,47 @@ private static function save_attachment( $attachment_data, $post_id, $author_id
 			}
 		}
 
-		// Prepare file array for WordPress.
+		// Get original filename from URL.
+		$original_name = \basename( \wp_parse_url( $attachment_data['url'], PHP_URL_PATH ) );
+
+		// Rename temp file to have proper extension for optimize_image to detect mime type.
+		$original_ext = \pathinfo( $original_name, PATHINFO_EXTENSION );
+		if ( $original_ext ) {
+			$renamed_tmp = $tmp_file . '.' . $original_ext;
+			if ( $wp_filesystem->move( $tmp_file, $renamed_tmp, true ) ) {
+				$tmp_file = $renamed_tmp;
+			}
+		}
+
+		// Optimize images before sideloading (resize and convert to WebP).
+		$tmp_file = self::optimize_image( $tmp_file, self::MAX_IMAGE_DIMENSION );
+
+		// Update filename extension to match optimized file.
+		$new_ext = \pathinfo( $tmp_file, PATHINFO_EXTENSION );
+		if ( $new_ext ) {
+			$original_name = \preg_replace( '/\.[^.]+$/', '.' . $new_ext, $original_name );
+		}
+
 		$file_array = array(
-			'name'     => \basename( \wp_parse_url( $attachment_data['url'], PHP_URL_PATH ) ),
+			'name'     => $original_name,
 			'tmp_name' => $tmp_file,
 		);
 
 		// Prepare attachment post data.
+		// Let WordPress auto-detect the mime type from the file.
 		$post_data = array(
-			'post_mime_type' => $attachment_data['mediaType'] ?? '',
-			'post_title'     => $attachment_data['name'] ?? '',
-			'post_content'   => $attachment_data['name'] ?? '',
-			'post_author'    => $author_id,
-			'meta_input'     => array(
+			'post_title'   => $attachment_data['name'] ?? '',
+			'post_content' => $attachment_data['name'] ?? '',
+			'post_author'  => $author_id,
+			'meta_input'   => array(
 				'_source_url' => $attachment_data['url'],
 			),
 		);
 
 		// Add alt text for images.
 		if ( ! empty( $attachment_data['name'] ) ) {
-			$mime_type = $attachment_data['mediaType'] ?? '';
-			if ( 'image' === strtok( $mime_type, '/' ) ) {
+			$original_mime = $attachment_data['mediaType'] ?? '';
+			if ( 'image' === strtok( $original_mime, '/' ) ) {
 				$post_data['meta_input']['_wp_attachment_image_alt'] = $attachment_data['name'];
 			}
 		}
@@ -489,6 +517,7 @@ private static function save_attachment( $attachment_data, $post_id, $author_id
 	 * @param array  $attachment_data The normalized attachment data.
 	 * @param int    $object_id       The post or comment ID to attach to.
 	 * @param string $object_type     The object type ('post' or 'comment').
+	 * @param int    $max_dimension   Optional. Maximum image dimension in pixels. Default MAX_IMAGE_DIMENSION.
 	 *
 	 * @return array|\WP_Error {
 	 *     Array of file data on success, WP_Error on failure.
@@ -498,7 +527,7 @@ private static function save_attachment( $attachment_data, $post_id, $author_id
 	 *     @type string $alt       Alt text from attachment name field.
 	 * }
 	 */
-	private static function save_file( $attachment_data, $object_id, $object_type ) {
+	private static function save_file( $attachment_data, $object_id, $object_type, $max_dimension = self::MAX_IMAGE_DIMENSION ) {
 		$mime_type = $attachment_data['mediaType'] ?? '';
 
 		// Skip download for video and audio files - use remote URL directly.
@@ -554,6 +583,10 @@ private static function save_file( $attachment_data, $object_id, $object_type )
 			return new \WP_Error( 'file_move_failed', \__( 'Failed to move file to destination.', 'activitypub' ) );
 		}
 
+		// Optimize images (resize and convert to WebP).
+		$file_path = self::optimize_image( $file_path, $max_dimension );
+		$file_name = \basename( $file_path );
+
 		// Get mime type and validate file.
 		$file_info = \wp_check_filetype_and_ext( $file_path, $file_name );
 		$mime_type = $file_info['type'] ?? $attachment_data['mediaType'] ?? '';
@@ -565,6 +598,104 @@ private static function save_file( $attachment_data, $object_id, $object_type )
 		);
 	}
 
+	/**
+	 * Get a unique file path by appending a counter if the file already exists.
+	 *
+	 * @param string $file_path The desired file path.
+	 *
+	 * @return string A unique file path that doesn't exist.
+	 */
+	private static function get_unique_path( $file_path ) {
+		if ( ! \file_exists( $file_path ) ) {
+			return $file_path;
+		}
+
+		$path_info = \pathinfo( $file_path );
+		$dir       = $path_info['dirname'];
+		$base_name = $path_info['filename'];
+		$extension = isset( $path_info['extension'] ) ? '.' . $path_info['extension'] : '';
+		$counter   = 1;
+
+		do {
+			$new_path = $dir . '/' . $base_name . '-' . $counter . $extension;
+			++$counter;
+		} while ( \file_exists( $new_path ) );
+
+		return $new_path;
+	}
+
+	/**
+	 * Optimize an image file by resizing and converting to WebP.
+	 *
+	 * Uses WordPress image editor to resize large images and convert them
+	 * to WebP format for better compression while maintaining quality.
+	 *
+	 * @param string $file_path     Path to the image file.
+	 * @param int    $max_dimension Maximum width/height in pixels.
+	 *
+	 * @return string The optimized file path.
+	 */
+	private static function optimize_image( $file_path, $max_dimension ) {
+		// Check if it's an image.
+		$mime_type = \wp_check_filetype( $file_path )['type'] ?? '';
+		if ( ! $mime_type || ! \str_starts_with( $mime_type, 'image/' ) ) {
+			return $file_path;
+		}
+
+		// Skip SVG and GIF files (GIFs may be animated).
+		if ( \in_array( $mime_type, array( 'image/svg+xml', 'image/gif' ), true ) ) {
+			return $file_path;
+		}
+
+		$editor = \wp_get_image_editor( $file_path );
+		if ( \is_wp_error( $editor ) ) {
+			return $file_path;
+		}
+
+		$size         = $editor->get_size();
+		$needs_resize = $size['width'] > $max_dimension || $size['height'] > $max_dimension;
+
+		// Resize if needed.
+		if ( $needs_resize ) {
+			$editor->resize( $max_dimension, $max_dimension, false );
+		}
+
+		// Check if WebP is supported.
+		$can_webp = $editor->supports_mime_type( 'image/webp' );
+
+		// Determine output format and save.
+		if ( $can_webp ) {
+			// Convert to WebP.
+			$new_path = self::get_unique_path( \preg_replace( '/\.[^.]+$/', '.webp', $file_path ) );
+			$result   = $editor->save( $new_path, 'image/webp' );
+		} elseif ( \in_array( $mime_type, array( 'image/png', 'image/webp' ), true ) ) {
+			// Keep original format for potentially transparent images when WebP not available.
+			if ( ! $needs_resize ) {
+				// No changes needed.
+				return $file_path;
+			}
+			$result = $editor->save( $file_path );
+		} else {
+			// Convert to JPEG when WebP not available.
+			$new_path = self::get_unique_path( \preg_replace( '/\.[^.]+$/', '.jpg', $file_path ) );
+			$result   = $editor->save( $new_path, 'image/jpeg' );
+		}
+
+		if ( \is_wp_error( $result ) ) {
+			return $file_path;
+		}
+
+		// Handle result - $result is always an array from $editor->save().
+		$result_path = $result['path'] ?? $file_path;
+
+		// If path changed (format conversion), delete the original file.
+		if ( $result_path !== $file_path ) {
+			\wp_delete_file( $file_path );
+		}
+
+		return $result_path;
+	}
+
 	/**
 	 * Append media to post content.
 	 *