Merge branch 'trunk' into refactor/reorganize-integrations

Author: pfefferle

.github/changelog/2314-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add unified attachment processor for handling ActivityPub media imports from both remote URLs and local files, with automatic media block generation and Classic Editor support.

.github/changelog/2373-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Refactored avatar handling into a new system that stores and manages avatars per remote actor, improving reliability and preparing for future caching support.

.github/changelog/2376-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Improved inbox performance by batching and deduplicating activities, reducing redundant processing and improving handling during high activity periods.

.github/changelog/2381-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Refactored activity handling to support multiple recipients per activity, allowing posts and interactions to be linked to several local users at once.

.github/changelog/2384-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Simplify follow() API return types to int|WP_Error for better predictability.

.github/changelog/2385-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix Following table error message to display user input instead of empty string when webfinger lookup fails.

.github/changelog/2387-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Improved Classic Editor integration by adding better media handling and full test coverage for attachments, permissions, and metadata.

.github/workflows/format.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.ref }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v6

activitypub.php

@@ -69,6 +69,8 @@ function rest_init() {
  */
 function plugin_init() {
 	\add_action( 'init', array( __NAMESPACE__ . '\Activitypub', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Attachments', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Avatars', 'init' ) );
 	\add_action( 'init', array( __NAMESPACE__ . '\Comment', 'init' ) );
 	\add_action( 'init', array( __NAMESPACE__ . '\Dispatcher', 'init' ) );
 	\add_action( 'init', array( __NAMESPACE__ . '\Embed', 'init' ) );

includes/class-activitypub.php

@@ -23,8 +23,6 @@ public static function init() {
 		\add_action( 'init', array( self::class, 'theme_compat' ), 11 );
 		\add_action( 'init', array( self::class, 'register_user_meta' ), 11 );
 
-		\add_filter( 'pre_get_avatar_data', array( self::class, 'pre_get_avatar_data' ), 11, 2 );
-
 		\add_action( 'wp_trash_post', array( self::class, 'trash_post' ), 1 );
 		\add_action( 'untrash_post', array( self::class, 'untrash_post' ), 1 );
 
@@ -90,56 +88,6 @@ public static function uninstall() {
 		Options::delete();
 	}
 
-	/**
-	 * Replaces the default avatar.
-	 *
-	 * @param array             $args        Arguments passed to get_avatar_data(), after processing.
-	 * @param int|string|object $id_or_email A user ID, email address, or comment object.
-	 *
-	 * @return array $args
-	 */
-	public static function pre_get_avatar_data( $args, $id_or_email ) {
-		if (
-			! $id_or_email instanceof \WP_Comment ||
-			! isset( $id_or_email->comment_type ) ||
-			$id_or_email->user_id
-		) {
-			return $args;
-		}
-
-		/**
-		 * Filter allowed comment types for avatars.
-		 *
-		 * @param array $allowed_comment_types Array of allowed comment types.
-		 */
-		$allowed_comment_types = \apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-		if ( ! \in_array( $id_or_email->comment_type ?: 'comment', $allowed_comment_types, true ) ) { // phpcs:ignore Universal.Operators.DisallowShortTernary
-			return $args;
-		}
-
-		// Check if comment has an avatar.
-		$avatar = \get_comment_meta( $id_or_email->comment_ID, 'avatar_url', true );
-
-		if ( $avatar ) {
-			if ( empty( $args['class'] ) ) {
-				$args['class'] = array();
-			} elseif ( \is_string( $args['class'] ) ) {
-				$args['class'] = \explode( ' ', $args['class'] );
-			}
-
-			/** This filter is documented in wp-includes/link-template.php */
-			$args['url']     = \apply_filters( 'get_avatar_url', $avatar, $id_or_email, $args );
-			$args['class'][] = 'avatar';
-			$args['class'][] = 'avatar-activitypub';
-			$args['class'][] = 'avatar-' . (int) $args['size'];
-			$args['class'][] = 'photo';
-			$args['class'][] = 'u-photo';
-			$args['class']   = \array_unique( $args['class'] );
-		}
-
-		return $args;
-	}
-
 	/**
 	 * Store permalink in meta, to send delete Activity.
 	 *