Merge branch 'trunk' into add/reader

Author: obenland

.github/changelog/2611-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Respect WordPress "show avatars" setting for remote actor avatars.

.github/changelog/2612-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add scheduled cleanup for remote posts, preserving posts with local user interactions.

.github/instructions/build.instructions.md

@@ -0,0 +1,6 @@
+---
+applyTo: "build/**"
+excludeAgent: "coding-agent"
+---
+
+Do not review these files. The `build/` directory contains generated assets.

build/followers/index.asset.php

@@ -47,6 +47,11 @@ public static function pre_get_avatar_data( $args, $id_or_email ) {
 			return $args;
 		}
 
+		// Respect WordPress "show avatars" setting.
+		if ( ! \get_option( 'show_avatars' ) ) {
+			return $args;
+		}
+
 		$avatar = null;
 
 		// First, try to get avatar from remote actor.

build/followers/index.js

@@ -169,7 +169,7 @@ public static function parse_csv_string( $content ) {
 		}
 
 		// Parse first line to detect format.
-		$first_line = \str_getcsv( $lines[0] );
+		$first_line = \str_getcsv( $lines[0], ',', '"', '\\' );
 		$first_cell = \trim( $first_line[0] ?? '' );
 		$has_header = \str_starts_with( $first_cell, '#' ) || 'domain' === \strtolower( $first_cell );
 
@@ -189,7 +189,7 @@ public static function parse_csv_string( $content ) {
 
 		// Process each line.
 		foreach ( $lines as $line ) {
-			$row    = \str_getcsv( $line );
+			$row    = \str_getcsv( $line, ',', '"', '\\' );
 			$domain = \trim( $row[ $domain_index ] ?? '' );
 
 			// Skip empty lines and comments.

build/followers/render.php

@@ -46,6 +46,7 @@ public static function enqueue_editor_assets() {
 				'user' => \admin_url( 'profile.php#activitypub' ),
 				'blog' => \admin_url( 'options-general.php?page=activitypub&tab=blog-profile' ),
 			),
+			'showAvatars'      => (bool) \get_option( 'show_avatars' ),
 		);
 		wp_localize_script( 'wp-editor', '_activityPubOptions', $data );
 

includes/class-avatars.php

@@ -12,6 +12,7 @@
 use Activitypub\Collection\Actors;
 use Activitypub\Collection\Inbox;
 use Activitypub\Collection\Outbox;
+use Activitypub\Collection\Posts;
 use Activitypub\Collection\Remote_Actors;
 use Activitypub\Scheduler\Actor;
 use Activitypub\Scheduler\Collection_Sync;
@@ -61,14 +62,16 @@ public static function init() {
 		\add_action( 'activitypub_reprocess_outbox', array( self::class, 'reprocess_outbox' ) );
 		\add_action( 'activitypub_outbox_purge', array( self::class, 'purge_outbox' ) );
 		\add_action( 'activitypub_inbox_purge', array( self::class, 'purge_inbox' ) );
+		\add_action( 'activitypub_ap_post_purge', array( self::class, 'purge_ap_posts' ) );
 		\add_action( 'activitypub_inbox_create_item', array( self::class, 'process_inbox_activity' ) );
 		\add_action( 'activitypub_sync_blocklist_subscriptions', array( Blocklist_Subscriptions::class, 'sync_all' ) );
 
 		\add_action( 'post_activitypub_add_to_outbox', array( self::class, 'schedule_outbox_activity_for_federation' ) );
 		\add_action( 'post_activitypub_add_to_outbox', array( self::class, 'schedule_announce_activity' ), 10, 4 );
 
-		\add_action( 'update_option_activitypub_outbox_purge_days', array( self::class, 'handle_outbox_purge_days_update' ), 10, 2 );
-		\add_action( 'update_option_activitypub_inbox_purge_days', array( self::class, 'handle_inbox_purge_days_update' ), 10, 2 );
+		\add_action( 'update_option_activitypub_outbox_purge_days', array( self::class, 'update_outbox_purge_schedule' ), 10, 2 );
+		\add_action( 'update_option_activitypub_inbox_purge_days', array( self::class, 'update_inbox_purge_schedule' ), 10, 2 );
+		\add_action( 'update_option_activitypub_ap_post_purge_days', array( self::class, 'update_ap_post_purge_schedule' ), 10, 2 );
 	}
 
 	/**
@@ -134,6 +137,10 @@ public static function register_schedules() {
 			\wp_schedule_event( time(), 'daily', 'activitypub_inbox_purge' );
 		}
 
+		if ( ! \wp_next_scheduled( 'activitypub_ap_post_purge' ) ) {
+			\wp_schedule_event( time(), 'daily', 'activitypub_ap_post_purge' );
+		}
+
 		if ( ! \wp_next_scheduled( 'activitypub_sync_blocklist_subscriptions' ) ) {
 			\wp_schedule_event( time(), 'weekly', 'activitypub_sync_blocklist_subscriptions' );
 		}
@@ -150,6 +157,7 @@ public static function deregister_schedules() {
 		\wp_unschedule_hook( 'activitypub_reprocess_outbox' );
 		\wp_unschedule_hook( 'activitypub_outbox_purge' );
 		\wp_unschedule_hook( 'activitypub_inbox_purge' );
+		\wp_unschedule_hook( 'activitypub_ap_post_purge' );
 		\wp_unschedule_hook( 'activitypub_sync_blocklist_subscriptions' );
 	}
 
@@ -315,66 +323,24 @@ public static function reprocess_outbox() {
 	 * Purge outbox items based on a schedule.
 	 */
 	public static function purge_outbox() {
-		$total_posts = (int) wp_count_posts( Outbox::POST_TYPE )->publish;
-		if ( $total_posts <= 20 ) {
-			return;
-		}
-
-		$days     = (int) get_option( 'activitypub_outbox_purge_days', 180 );
-		$post_ids = \get_posts(
-			array(
-				'post_type'   => Outbox::POST_TYPE,
-				'post_status' => 'any',
-				'fields'      => 'ids',
-				'numberposts' => -1,
-				'date_query'  => array(
-					array(
-						'before' => gmdate( 'Y-m-d', time() - ( $days * DAY_IN_SECONDS ) ),
-					),
-				),
-				// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
-				'meta_query'  => array(
-					array(
-						'key'     => '_activitypub_activity_type',
-						'value'   => 'Follow',
-						'compare' => '!=',
-					),
-				),
-			)
-		);
-
-		foreach ( $post_ids as $post_id ) {
-			\wp_delete_post( $post_id, true );
-		}
+		$days = (int) \get_option( 'activitypub_outbox_purge_days', 180 );
+		Outbox::purge( $days );
 	}
 
 	/**
 	 * Purge inbox items based on a schedule.
 	 */
 	public static function purge_inbox() {
-		$total_posts = (int) wp_count_posts( Inbox::POST_TYPE )->publish;
-		if ( $total_posts <= 200 ) {
-			return;
-		}
-
-		$days     = (int) get_option( 'activitypub_inbox_purge_days', 180 );
-		$post_ids = \get_posts(
-			array(
-				'post_type'   => Inbox::POST_TYPE,
-				'post_status' => 'any',
-				'fields'      => 'ids',
-				'numberposts' => -1,
-				'date_query'  => array(
-					array(
-						'before' => gmdate( 'Y-m-d', time() - ( $days * DAY_IN_SECONDS ) ),
-					),
-				),
-			)
-		);
+		$days = (int) \get_option( 'activitypub_inbox_purge_days', 180 );
+		Inbox::purge( $days );
+	}
 
-		foreach ( $post_ids as $post_id ) {
-			\wp_delete_post( $post_id, true );
-		}
+	/**
+	 * Purge remote posts based on a schedule.
+	 */
+	public static function purge_ap_posts() {
+		$days = (int) \get_option( 'activitypub_ap_post_purge_days', 30 );
+		Posts::purge( $days );
 	}
 
 	/**
@@ -430,7 +396,7 @@ public static function process_inbox_activity( $activity_id ) {
 	 * @param int $old_value The old value.
 	 * @param int $value     The new value.
 	 */
-	public static function handle_outbox_purge_days_update( $old_value, $value ) {
+	public static function update_outbox_purge_schedule( $old_value, $value ) {
 		if ( 0 === (int) $value ) {
 			\wp_clear_scheduled_hook( 'activitypub_outbox_purge' );
 		} elseif ( ! \wp_next_scheduled( 'activitypub_outbox_purge' ) ) {
@@ -444,14 +410,28 @@ public static function handle_outbox_purge_days_update( $old_value, $value ) {
 	 * @param int $old_value The old value.
 	 * @param int $value     The new value.
 	 */
-	public static function handle_inbox_purge_days_update( $old_value, $value ) {
+	public static function update_inbox_purge_schedule( $old_value, $value ) {
 		if ( 0 === (int) $value ) {
 			\wp_clear_scheduled_hook( 'activitypub_inbox_purge' );
 		} elseif ( ! \wp_next_scheduled( 'activitypub_inbox_purge' ) ) {
 			\wp_schedule_event( \time(), 'daily', 'activitypub_inbox_purge' );
 		}
 	}
 
+	/**
+	 * Update schedules when remote posts purge days settings change.
+	 *
+	 * @param int $old_value The old value.
+	 * @param int $value     The new value.
+	 */
+	public static function update_ap_post_purge_schedule( $old_value, $value ) {
+		if ( 0 === (int) $value ) {
+			\wp_clear_scheduled_hook( 'activitypub_ap_post_purge' );
+		} elseif ( ! \wp_next_scheduled( 'activitypub_ap_post_purge' ) ) {
+			\wp_schedule_event( \time(), 'daily', 'activitypub_ap_post_purge' );
+		}
+	}
+
 	/**
 	 * Asynchronously runs batch processing routines.
 	 *