Delete Reader Item

includes/class-post-types.php

@@ -348,7 +348,7 @@ public static function register_outbox_post_type() {
 	}
 
 	/**
-	 * Register the Object post type.
+	 * Register the Post post type.
 	 */
 	public static function register_post_post_type() {
 		\register_post_type(

includes/class-scheduler.php

@@ -222,7 +222,8 @@ public static function cleanup_remote_actors() {
 				\wp_delete_post( $actor->ID );
 			} elseif ( empty( $meta ) || ! is_array( $meta ) || \is_wp_error( $meta ) ) {
 				if ( Remote_Actors::count_errors( $actor->ID ) >= 5 ) {
-					\wp_schedule_single_event( \time(), 'activitypub_delete_actor_interactions', array( $actor->guid ) );
+					\wp_schedule_single_event( \time(), 'activitypub_delete_remote_actor_interactions', array( $actor->guid ) );
+					\wp_schedule_single_event( \time(), 'activitypub_delete_remote_actor_posts', array( $actor->guid ) );
 					\wp_delete_post( $actor->ID );
 				} else {
 					Remote_Actors::add_error( $actor->ID, $meta );

includes/collection/class-posts.php

@@ -119,6 +119,33 @@ public static function update( $activity ) {
 		return \get_post( $post_id );
 	}
 
+	/**
+	 * Delete an object from the collection.
+	 *
+	 * @param int $id The object ID.
+	 *
+	 * @return bool|int|null The deleted post ID, false on failure, or null if no post to delete.
+	 */
+	public static function delete( $id ) {
+		return \wp_delete_post( $id, true );
+	}
+
+	/**
+	 * Delete an object from the collection by its GUID.
+	 *
+	 * @param string $guid The object GUID.
+	 *
+	 * @return bool|int|null The deleted post ID, false on failure, or null if no post to delete.
+	 */
+	public static function delete_by_guid( $guid ) {
+		$post = self::get_by_guid( $guid );
+		if ( \is_wp_error( $post ) ) {
+			return $post;
+		}
+
+		return self::delete( $post->ID );
+	}
+
 	/**
 	 * Convert an activity to a post array.
 	 *
@@ -164,4 +191,31 @@ private static function add_taxonomies( $post_id, $activity_object ) {
 
 		\wp_set_post_terms( $post_id, $tags, 'ap_tag' );
 	}
+
+	/**
+	 * Get posts by remote actor.
+	 *
+	 * @param string $actor The remote actor URI.
+	 *
+	 * @return array Array of WP_Post objects.
+	 */
+	public static function get_by_remote_actor( $actor ) {
+		$remote_actor = Remote_Actors::fetch_by_uri( $actor );
+		if ( \is_wp_error( $remote_actor ) ) {
+			return array();
+		}
+
+		$query = new \WP_Query(
+			array(
+				'post_type'      => self::POST_TYPE,
+				'posts_per_page' => -1,
+				// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key
+				'meta_key'       => '_activitypub_remote_actor_id',
+				// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_value
+				'meta_value'     => $remote_actor->ID,
+			)
+		);
+
+		return $query->posts;
+	}
 }

includes/handler/class-delete.php

@@ -8,9 +8,11 @@
 namespace Activitypub\Handler;
 
 use Activitypub\Collection\Interactions;
+use Activitypub\Collection\Posts;
 use Activitypub\Collection\Remote_Actors;
 use Activitypub\Tombstone;
 
+use function Activitypub\is_activity_reply;
 use function Activitypub\object_to_uri;
 
 /**
@@ -23,7 +25,8 @@ class Delete {
 	public static function init() {
 		\add_action( 'activitypub_inbox_delete', array( self::class, 'handle_delete' ), 10, 2 );
 		\add_filter( 'activitypub_defer_signature_verification', array( self::class, 'defer_signature_verification' ), 10, 2 );
-		\add_action( 'activitypub_delete_actor_interactions', array( self::class, 'delete_interactions' ) );
+		\add_action( 'activitypub_delete_remote_actor_interactions', array( self::class, 'delete_interactions' ) );
+		\add_action( 'activitypub_delete_remote_actor_posts', array( self::class, 'delete_posts' ) );
 
 		\add_filter( 'activitypub_get_outbox_activity', array( self::class, 'outbox_activity' ) );
 		\add_action( 'post_activitypub_add_to_outbox', array( self::class, 'post_add_to_outbox' ), 10, 2 );
@@ -37,8 +40,6 @@ public static function init() {
 	 */
 	public static function handle_delete( $activity, $user_id ) {
 		$object_type = $activity['object']['type'] ?? '';
-		$success     = false;
-		$result      = null;
 
 		switch ( $object_type ) {
 			/*
@@ -51,7 +52,7 @@ public static function handle_delete( $activity, $user_id ) {
 			case 'Organization':
 			case 'Service':
 			case 'Application':
-				$result = self::maybe_delete_follower( $activity );
+				self::delete_remote_actor( $activity, $user_id );
 				break;
 
 			/*
@@ -66,7 +67,7 @@ public static function handle_delete( $activity, $user_id ) {
 			case 'Video':
 			case 'Event':
 			case 'Document':
-				$result = self::maybe_delete_interaction( $activity );
+				self::delete_object( $activity, $user_id );
 				break;
 
 			/*
@@ -75,7 +76,7 @@ public static function handle_delete( $activity, $user_id ) {
 			 * @see: https://www.w3.org/TR/activitystreams-vocabulary/#dfn-tombstone
 			 */
 			case 'Tombstone':
-				$result = self::maybe_delete_interaction( $activity );
+				self::delete_object( $activity, $user_id );
 				break;
 
 			/*
@@ -84,32 +85,65 @@ public static function handle_delete( $activity, $user_id ) {
 			 * @see https://www.w3.org/TR/activitystreams-core/#example-1
 			 */
 			default:
-				// Ignore non Minimal Activities.
-				if ( ! is_string( $activity['object'] ) ) {
-					return;
-				}
-
 				// Check if Object is an Actor.
-				if ( $activity['actor'] === $activity['object'] ) {
-					$result = self::maybe_delete_follower( $activity );
-				} else { // Assume an interaction otherwise.
-					$result = self::maybe_delete_interaction( $activity );
+				if ( object_to_uri( $activity['object'] ) === $activity['actor'] ) {
+					self::delete_remote_actor( $activity, $user_id );
+				} else { // Assume an object otherwise.
+					self::delete_object( $activity, $user_id );
 				}
 				// Maybe handle Delete Activity for other Object Types.
 				break;
 		}
+	}
+
+	/**
+	 * Delete an Object.
+	 *
+	 * @param array $activity The Activity object.
+	 * @param int   $user_id  The user ID.
+	 */
+	public static function delete_object( $activity, $user_id ) {
+		// Check for private and/or direct messages.
+		if ( is_activity_reply( $activity ) ) {
+			$result = self::maybe_delete_interaction( $activity );
+		} else {
+			$result = self::maybe_delete_post( $activity );
+		}
+
+		$success = ( $result && ! \is_wp_error( $result ) );
+
+		/**
+		 * Fires after an ActivityPub Delete activity has been handled.
+		 *
+		 * @param array      $activity The ActivityPub activity data.
+		 * @param int        $user_id  The local user ID.
+		 * @param bool       $success  True on success, false otherwise.
+		 * @param mixed|null $result   The result of the delete operation.
+		 */
+		\do_action( 'activitypub_handled_delete', $activity, $user_id, $success, $result );
+	}
 
-		$success = (bool) $result;
+	/**
+	 * Delete an Actor.
+	 *
+	 * @param array $activity The Activity object.
+	 * @param int   $user_id  The user ID.
+	 */
+	public static function delete_remote_actor( $activity, $user_id ) {
+		$result  = self::maybe_delete_follower( $activity );
+		$success = ( $result && ! \is_wp_error( $result ) );
 
 		/**
 		 * Fires after an ActivityPub Delete activity has been handled.
 		 *
 		 * @param array      $activity The ActivityPub activity data.
 		 * @param int        $user_id  The local user ID.
 		 * @param bool       $success  True on success, false otherwise.
-		 * @param mixed|null $result   The result of the delete operation (e.g., WP_Comment object or deletion status).
+		 * @param mixed|null $result   The result of the delete operation.
 		 */
 		\do_action( 'activitypub_handled_delete', $activity, $user_id, $success, $result );
+
+		return $result;
 	}
 
 	/**
@@ -126,6 +160,7 @@ public static function maybe_delete_follower( $activity ) {
 		if ( ! is_wp_error( $follower ) && Tombstone::exists( $activity['actor'] ) ) {
 			$state = Remote_Actors::delete( $follower->ID );
 			self::maybe_delete_interactions( $activity );
+			self::maybe_delete_posts( $activity );
 		}
 
 		return $state ?? false;
@@ -143,7 +178,29 @@ public static function maybe_delete_interactions( $activity ) {
 		if ( Tombstone::exists( $activity['actor'] ) ) {
 			\wp_schedule_single_event(
 				\time(),
-				'activitypub_delete_actor_interactions',
+				'activitypub_delete_remote_actor_interactions',
+				array( $activity['actor'] )
+			);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Delete Reactions if Actor-URL is a Tombstone.
+	 *
+	 * @param array $activity The delete activity.
+	 *
+	 * @return bool True on success, false otherwise.
+	 */
+	public static function maybe_delete_posts( $activity ) {
+		// Verify that Actor is deleted.
+		if ( Tombstone::exists( $activity['actor'] ) ) {
+			\wp_schedule_single_event(
+				\time(),
+				'activitypub_delete_remote_actor_posts',
 				array( $activity['actor'] )
 			);
 
@@ -164,7 +221,7 @@ public static function delete_interactions( $actor ) {
 		$comments = Interactions::get_by_actor( $actor );
 
 		foreach ( $comments as $comment ) {
-			wp_delete_comment( $comment, true );
+			\wp_delete_comment( $comment, true );
 		}
 
 		if ( $comments ) {
@@ -174,6 +231,27 @@ public static function delete_interactions( $actor ) {
 		}
 	}
 
+	/**
+	 * Delete comments from an Actor.
+	 *
+	 * @param string $actor The URL of the actor whose comments to delete.
+	 *
+	 * @return bool True on success, false otherwise.
+	 */
+	public static function delete_posts( $actor ) {
+		$posts = Posts::get_by_remote_actor( $actor );
+
+		foreach ( $posts as $post ) {
+			Posts::delete( $post->ID );
+		}
+
+		if ( $posts ) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	/**
 	 * Delete a Reaction if URL is a Tombstone.
 	 *
@@ -201,6 +279,24 @@ public static function maybe_delete_interaction( $activity ) {
 		return false;
 	}
 
+	/**
+	 * Delete a post from the Posts collection.
+	 *
+	 * @param array $activity The delete activity.
+	 *
+	 * @return bool|\WP_Error True on success, false or WP_Error on failure.
+	 */
+	public static function maybe_delete_post( $activity ) {
+		$id = object_to_uri( $activity['object'] );
+
+		// Check if the object exists and is a tombstone.
+		if ( Tombstone::exists( $id ) ) {
+			return Posts::delete_by_guid( $id );
+		}
+
+		return false;
+	}
+
 	/**
 	 * Defer signature verification for `Delete` requests.
 	 *

tests/phpunit/tests/includes/class-test-scheduler.php

@@ -700,7 +700,7 @@ function () {
 		\add_filter(
 			'schedule_event',
 			function ( $event ) use ( &$scheduled_events ) {
-				if ( 'activitypub_delete_actor_interactions' === $event->hook ) {
+				if ( 'activitypub_delete_remote_actor_interactions' === $event->hook ) {
 					$scheduled_events[] = array(
 						'hook' => $event->hook,
 						'args' => $event->args,
@@ -722,7 +722,7 @@ function () {
 
 		// Verify that the event was scheduled with the actor URL as parameter.
 		$this->assertCount( 1, $scheduled_events, 'Should schedule 1 event' );
-		$this->assertEquals( 'activitypub_delete_actor_interactions', $scheduled_events[0]['hook'], 'Should schedule the correct hook' );
+		$this->assertEquals( 'activitypub_delete_remote_actor_interactions', $scheduled_events[0]['hook'], 'Should schedule the correct hook' );
 		$this->assertCount( 1, $scheduled_events[0]['args'], 'Should have 1 argument' );
 		$this->assertEquals( 'https://example.com/users/test', $scheduled_events[0]['args'][0], 'Should pass actor URL as parameter' );