Scheduler: Don't federate Deletes of unfederated posts. (#1528)

* Scheduler: Don't federate Deletes of unfederated posts.

* Add changelog

Author: obenland

.github/changelog/1528-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+No longer federates `Delete` activities for posts that were not federated.

includes/scheduler/class-post.php

@@ -8,6 +8,7 @@
 namespace Activitypub\Scheduler;
 
 use function Activitypub\add_to_outbox;
+use function Activitypub\get_wp_object_state;
 use function Activitypub\is_post_disabled;
 
 /**
@@ -62,7 +63,7 @@ public static function schedule_post_activity( $post_id, $post, $update, $post_b
 				break;
 
 			case 'trash':
-				$type = 'Delete';
+				$type = 'federated' === get_wp_object_state( $post ) ? 'Delete' : false;
 				break;
 
 			default:

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

@@ -7,6 +7,8 @@
 
 namespace Activitypub\Tests\Scheduler;
 
+use Activitypub\Scheduler\Post;
+
 /**
  * Test Post scheduler class.
  *
@@ -24,23 +26,23 @@ public function test_transition_attachment_status() {
 		wp_set_current_user( self::$user_id );
 
 		// Create.
-		$post_id       = self::factory()->attachment->create_upload_object( dirname( __DIR__, 2 ) . '/assets/test.jpg' );
-		$activitpub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
-		$outbox_item   = $this->get_latest_outbox_item( $activitpub_id );
+		$post_id        = self::factory()->attachment->create_upload_object( dirname( __DIR__, 2 ) . '/assets/test.jpg' );
+		$activitypub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
+		$outbox_item    = $this->get_latest_outbox_item( $activitypub_id );
 
 		$this->assertNotNull( $outbox_item );
 		$this->assertSame( 'Create', \get_post_meta( $outbox_item->ID, '_activitypub_activity_type', true ) );
 
 		// Update.
 		self::factory()->attachment->update_object( $post_id, array( 'post_title' => 'Updated title' ) );
 
-		$outbox_item = $this->get_latest_outbox_item( $activitpub_id );
+		$outbox_item = $this->get_latest_outbox_item( $activitypub_id );
 		$this->assertSame( 'Update', \get_post_meta( $outbox_item->ID, '_activitypub_activity_type', true ) );
 
 		// Delete.
 		\wp_delete_attachment( $post_id, true );
 
-		$outbox_item = $this->get_latest_outbox_item( $activitpub_id );
+		$outbox_item = $this->get_latest_outbox_item( $activitypub_id );
 		$this->assertSame( 'Delete', \get_post_meta( $outbox_item->ID, '_activitypub_activity_type', true ) );
 
 		remove_post_type_support( 'attachment', 'activitypub' );
@@ -52,12 +54,31 @@ public function test_transition_attachment_status() {
 	 * @covers ::schedule_post_activity
 	 */
 	public function test_schedule_post_activity_regular_post() {
-		$post_id       = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
-		$activitpub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
+		$post_id        = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
+		$activitypub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
 
-		$post = $this->get_latest_outbox_item( $activitpub_id );
+		$post = $this->get_latest_outbox_item( $activitypub_id );
 		$id   = \get_post_meta( $post->ID, '_activitypub_object_id', true );
-		$this->assertSame( $activitpub_id, $id );
+		$this->assertSame( $activitypub_id, $id );
+
+		\wp_delete_post( $post_id, true );
+	}
+
+	/**
+	 * Test post activity scheduling for regular posts.
+	 *
+	 * @covers ::schedule_post_activity
+	 */
+	public function test_not_schedule_delete_activity_unfederated_post() {
+		\remove_action( 'wp_after_insert_post', array( Post::class, 'schedule_post_activity' ), 33 );
+		$post_id        = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
+		$activitypub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
+		\add_action( 'wp_after_insert_post', array( Post::class, 'schedule_post_activity' ), 33, 4 );
+
+		// Trash the post.
+		\wp_delete_post( $post_id );
+
+		$this->assertNull( $this->get_latest_outbox_item( $activitypub_id ) );
 
 		\wp_delete_post( $post_id, true );
 	}
@@ -69,17 +90,17 @@ public function test_schedule_post_activity_regular_post() {
 	 * @covers ::schedule_post_activity
 	 */
 	public function test_activity_type_on_publish() {
-		$post_id       = self::factory()->post->create(
+		$post_id        = self::factory()->post->create(
 			array(
 				'post_author' => self::$user_id,
 				'post_status' => 'draft',
 			)
 		);
-		$activitpub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
+		$activitypub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
 
 		\wp_publish_post( $post_id );
 
-		$post = $this->get_latest_outbox_item( $activitpub_id );
+		$post = $this->get_latest_outbox_item( $activitypub_id );
 		$type = \get_post_meta( $post->ID, '_activitypub_activity_type', true );
 		$this->assertSame( 'Create', $type );
 
@@ -93,8 +114,8 @@ public function test_activity_type_on_publish() {
 	 */
 	public function test_schedule_post_activity_bulk_edit() {
 		wp_set_current_user( self::$user_id );
-		$post_id       = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
-		$activitpub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
+		$post_id        = self::factory()->post->create( array( 'post_author' => self::$user_id ) );
+		$activitypub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
 
 		// Test bulk edit that should bail (no author or status change).
 		$_REQUEST['bulk_edit']   = 1;
@@ -104,7 +125,7 @@ public function test_schedule_post_activity_bulk_edit() {
 
 		bulk_edit_posts( $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification
 
-		$outbox_item = $this->get_latest_outbox_item( $activitpub_id );
+		$outbox_item = $this->get_latest_outbox_item( $activitypub_id );
 		$this->assertNotSame( 'Update', \get_post_meta( $outbox_item->ID, '_activitypub_activity_type', true ) );
 
 		// Test bulk edit with author change (should not bail).
@@ -116,7 +137,7 @@ public function test_schedule_post_activity_bulk_edit() {
 
 		bulk_edit_posts( $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification
 
-		$outbox_item = $this->get_latest_outbox_item( $activitpub_id );
+		$outbox_item = $this->get_latest_outbox_item( $activitypub_id );
 		$this->assertNotNull( $outbox_item );
 
 		$this->assertSame( 'Update', \get_post_meta( $outbox_item->ID, '_activitypub_activity_type', true ) );
@@ -126,7 +147,7 @@ public function test_schedule_post_activity_bulk_edit() {
 
 		bulk_edit_posts( $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification
 
-		$outbox_item = $this->get_latest_outbox_item( $activitpub_id );
+		$outbox_item = $this->get_latest_outbox_item( $activitypub_id );
 		$this->assertNotNull( $outbox_item );
 		$this->assertSame( 'Delete', \get_post_meta( $outbox_item->ID, '_activitypub_activity_type', true ) );
 
@@ -138,7 +159,7 @@ public function test_schedule_post_activity_bulk_edit() {
 	/**
 	 * Data provider for no activity tests.
 	 *
-	 * @return array[] Test parameters.
+	 * @return array[][] Test parameters.
 	 */
 	public function no_activity_post_provider() {
 		return array(
@@ -166,10 +187,10 @@ public function no_activity_post_provider() {
 	 * @param array $args Post data for creating the test post.
 	 */
 	public function test_no_activity_scheduled( $args ) {
-		$post_id       = self::factory()->post->create( $args );
-		$activitpub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
+		$post_id        = self::factory()->post->create( $args );
+		$activitypub_id = \add_query_arg( 'p', $post_id, \home_url( '/' ) );
 
-		$this->assertNull( $this->get_latest_outbox_item( $activitpub_id ) );
+		$this->assertNull( $this->get_latest_outbox_item( $activitypub_id ) );
 
 		\wp_delete_post( $post_id, true );
 	}