Enable filtering whether Distributor should update distributed post statuses when the origin post status changes

includes/classes/API/SubscriptionsController.php

@@ -257,15 +257,19 @@ public function receive_item( $request ) {
 				return $response;
 			}
 
-			wp_update_post(
-				[
-					'ID'           => $request['post_id'],
-					'post_title'   => $request['post_data']['title'],
-					'post_content' => $content,
-					'post_excerpt' => $request['post_data']['excerpt'],
-					'post_name'    => $request['post_data']['slug'],
-				]
-			);
+			$post_update = [
+				'ID'           => $request['post_id'],
+				'post_title'   => $request['post_data']['title'],
+				'post_content' => $content,
+				'post_excerpt' => $request['post_data']['excerpt'],
+				'post_name'    => $request['post_data']['slug'],
+			];
+
+			if ( isset( $request['post_data']['status'] ) ) {
+				$post_update['post_status'] = $request['post_data']['status'];
+			}
+
+			wp_update_post( $post_update );
 
 			/**
 			 * We check if each of these exist since the API removes empty arrays from requests

includes/classes/Authentications/WordPressDotcomOauth2Authentication.php

@@ -81,10 +81,10 @@ public static function credentials_form( $args = array() ) {
 		// Calculate the redirect_uri to use for authorization (the current admin url & query vars).
 		$redirect_uri                   = esc_url(
 			( is_ssl() ? 'https://' : 'http://' ) .
-			sanitize_text_field( isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '' ) . // Input var okay. WPCS: CSRF ok.
-			sanitize_text_field( isset( $_SERVER['SCRIPT_NAME'] ) ? $_SERVER['SCRIPT_NAME'] : '' ) . // WPCS: input var ok.
+			sanitize_text_field( isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '' ) .
+			sanitize_text_field( isset( $_SERVER['SCRIPT_NAME'] ) ? $_SERVER['SCRIPT_NAME'] : '' ) .
 			'?' .
-			sanitize_text_field( isset( $_SERVER['QUERY_STRING'] ) ? $_SERVER['QUERY_STRING'] : '' ) // WPCS: input var ok.
+			sanitize_text_field( isset( $_SERVER['QUERY_STRING'] ) ? $_SERVER['QUERY_STRING'] : '' )
 		);
 		$args[ self::API_REDIRECT_URI ] = $redirect_uri;
 

includes/classes/InternalConnections/NetworkSiteConnection.php

@@ -68,14 +68,24 @@ public function push( $post_id, $args = array() ) {
 		$original_post_url = get_permalink( $post_id );
 		$using_gutenberg   = \Distributor\Utils\is_using_gutenberg( $post );
 
+		/**
+		 * Filter whether Distributor should update post statuses when the origin post status changes.
+		 *
+		 * False by default, return true to have post statuses distributed.
+		 *
+		 * @since 2.0.0
+		 * @hook dt_distribute_post_status
+		 */
+		$distribute_post_status = apply_filters( 'dt_distribute_post_status', false );
+
 		$new_post_args = array(
 			'post_title'   => get_the_title( $post_id ),
 			'post_name'    => $post->post_name,
 			'post_content' => Utils\get_processed_content( $post->post_content ),
 			'post_excerpt' => $post->post_excerpt,
 			'post_type'    => $post->post_type,
 			'post_author'  => get_current_user_id(),
-			'post_status'  => 'publish',
+			'post_status'  => $distribute_post_status ? $post->post_status : 'publish',
 		);
 
 		$media = \Distributor\Utils\prepare_media( $post_id );
@@ -100,10 +110,13 @@ public function push( $post_id, $args = array() ) {
 		if ( empty( $args['post_status'] ) ) {
 			if ( isset( $new_post_args['ID'] ) ) {
 
-				// Avoid updating the status of previously distributed posts.
-				$existing_status = get_post_status( (int) $new_post_args['ID'] );
-				if ( $existing_status ) {
-					$new_post_args['post_status'] = $existing_status;
+				if ( ! $distribute_post_status ) {
+
+					// Avoid updating the status of previously distributed posts.
+					$existing_status = get_post_status( (int) $new_post_args['ID'] );
+					if ( $existing_status ) {
+						$new_post_args['post_status'] = $existing_status;
+					}
 				}
 			}
 		} else {

includes/subscriptions.php

@@ -277,6 +277,19 @@ function send_notifications( $post_id ) {
 			}
 		}
 
+		/**
+		 * Filter whether Distributor should update post statuses when the origin post status changes.
+		 *
+		 * False by default, return true to have post statuses distributed.
+		 *
+		 * @since 2.0.0
+		 * @hook dt_distribute_post_status
+		 */
+		$distribute_post_status = apply_filters( 'dt_distribute_post_status', false );
+		if ( $distribute_post_status ) {
+			$post_body['post_data']['status'] = $post->post_status;
+		}
+
 		$request = wp_remote_post(
 			untrailingslashit( $target_url ) . '/wp/v2/dt_subscription/receive',
 			[

tests/test-plugins/enable-post-status-distribution/enable-post-status-distribution.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Plugin Name:       Enable post status distribution
+ * Description:       Helper plugin for Distributor tests. Enables post status distribution with the `dt_distribute_post_status` filter.
+ * Version:           1.0.0
+ * Author:            10up Inc.
+ * Author URI:        https://distributorplugin.com
+ * License:           GPLv2 or later
+ * Text Domain:       distributor-tests
+ * Domain Path:       /lang/
+ * GitHub Plugin URI: https://github.com/10up/distributor-tests
+ *
+ * @package distributor-tests
+ */
+
+// Enable post status distribution.
+add_filter( 'dt_distribute_post_status', '__return_true' );

tests/wpacceptance/DistributedPostTest.php

@@ -19,9 +19,13 @@ public function testDistributedCount() {
 
 		$I->loginAs( 'wpsnapshots' );
 
-		self::assertPostFieldContains( 40, 'post_title', 'Test Post' );
+		// Don't test in block editor.
+		$editor_has_blocks =  $this->editorHasBlocks( $I );
+		if ( $editor_has_blocks ) {
+			return;
+		}
 
-		return;
+		self::assertPostFieldContains( 40, 'post_title', 'Test Post' );
 
 		// Distribute post
 		$post_info = $this->pushPost( $I, 40, 2 );
@@ -102,4 +106,89 @@ public function testDistributedFrom() {
 
 		$this->assertTrue( ( false !== strpos( $source, '<link rel="canonical" href="' . rtrim( $post_info['original_front_url'], '/' ) ) ) );
 	}
+
+	/**
+	 * Test network push status updates with the `dt_distribute_post_status` filter.
+	 */
+	public function testNetworkPushStatusDistribution() {
+		$I = $this->openBrowserPage();
+		$I->loginAs( 'wpsnapshots' );
+
+		// Don't test in block editor.
+		$editor_has_blocks =  $this->editorHasBlocks( $I );
+		if ( $editor_has_blocks ) {
+			return;
+		}
+
+		$post_info = $this->pushPost( $I, 40, 2 );
+		$this->statusDistributionTest( $post_info, $I );
+	}
+	/**
+	 * Test network pull status updates with the `dt_distribute_post_status` filter.
+	 */
+	public function testNetworkPullStatusDistribution() {
+		$I = $this->openBrowserPage();
+		$I->loginAs( 'wpsnapshots' );
+
+		// Don't test in block editor.
+		$editor_has_blocks =  $this->editorHasBlocks( $I );
+		if ( $editor_has_blocks ) {
+			return;
+		}
+
+		$post_info = $this->pullPost( $I, 40, 'two', '' );
+		$this->statusDistributionTest( $post_info, $I );
+	}
+
+	/**
+	 * Test external push status updates with the `dt_distribute_post_status` filter.
+	 */
+	public function testExternalPushStatusDistribution() {
+		$I = $this->openBrowserPage();
+		$I->loginAs( 'wpsnapshots' );
+
+		// Don't test in block editor.
+		$editor_has_blocks =  $this->editorHasBlocks( $I );
+		if ( $editor_has_blocks ) {
+			return;
+		}
+
+		// Create an external connection.
+		$this->createExternalConnection( $I );
+		$url = $I->getCurrentUrl();
+		preg_match( '/post=(\d+)/', $url, $matches );
+
+		$post_info = $this->pushPost( $I, 40, (int) $matches[1], '', 'publish', true );
+		$I->moveTo( 'two/wp-admin/edit.php' );
+
+		// Grab the distributed post edit URL.
+		$I->waitUntilElementVisible( '#the-list' );
+		$I->click( 'a.row-title' );
+		$I->waitUntilNavigation();
+		$url = $I->getCurrentUrl();
+		$post_info['distributed_edit_url'] = $url;
+
+		$this->statusDistributionTest( $post_info, $I );
+	}
+
+	/**
+	 * Test external pull status updates with the `dt_distribute_post_status` filter.
+	 */
+	public function testExternalPullStatusDistribution() {
+		$I = $this->openBrowserPage();
+		$I->loginAs( 'wpsnapshots' );
+
+		// Don't test in block editor.
+		$editor_has_blocks =  $this->editorHasBlocks( $I );
+		if ( $editor_has_blocks ) {
+			return;
+		}
+
+		// Create an external connection.
+		$this->createExternalConnection( $I );
+		// Pull post from external connection.
+		$post_info = $this->pullPost( $I, 40, 'two', '', 'Test External Connection' );
+		$this->statusDistributionTest( $post_info, $I );
+	}
+
 }

tests/wpacceptance/includes/TestCase.php

@@ -166,4 +166,82 @@ protected function dismissNUXTip( $actor ) {
 		} catch ( \Exception $e ) {}
 	}
 
+	/**
+	 * Test status distribution.
+	 *
+	 * @param Object $post_info                  Information about the distributed post.
+	 * @param \WPAcceptance\PHPUnit\Actor $actor The Actor instance.
+	 */
+	protected function statusDistributionTest( $post_info, $actor ) {
+
+		// TEST SCENARIO: with 'dt_distribute_post_status' false (DEFAULT).
+		// Deactivate the plugin?
+		$actor->moveTo( '/wp-admin/plugins.php' );
+		usleep( 300 );
+
+		// Check the distributed post state.
+		$actor->moveTo( $post_info['distributed_edit_url'] );
+		$actor->waitUntilElementVisible( 'body.post-php' );
+
+		// The remote post should start in a Published post status.
+		$actor->seeText( 'Published', '#post-status-display' );
+
+		// Go back to the origin post.
+		$actor->moveTo( $post_info['original_edit_url'] );
+		$actor->waitUntilElementVisible( 'body.post-php' );
+
+		// The origin post should be in a published post status.
+		$actor->seeText( 'Published', '#post-status-display' );
+
+		// Change the origin post status to draft.
+		$actor->click( '.edit-post-status' );
+		$actor->waitUntilElementVisible( '#post_status' );
+		$actor->selectOptionByValue( '#post_status', 'draft' );
+		$actor->click( '.save-post-status' );
+		usleep( 200 );
+		$actor->click( '#publish' ); // Click the 'Update' button.
+		$actor->waitUntilElementVisible( '#wpadminbar' );
+
+		// The remote post will still be in a published status, the post status is not distributed.
+		$actor->moveTo( $post_info['distributed_edit_url'] );
+		$actor->waitUntilElementVisible( 'body.post-php' );
+		$actor->seeText( 'Published', '#post-status-display' );
+
+		// TEST SCENARIO: with 'dt_distribute_post_status' true - activate the helper plugin.
+		$actor->moveTo( '/wp-admin/plugins.php' );
+		$actor->click( '[data-slug="enable-post-status-distribution"] .activate a' );
+		$actor->waitUntilElementVisible( '#message' );
+
+		// Update the origin post
+		$actor->moveTo( $post_info['original_edit_url'] );
+		$actor->waitUntilElementVisible( 'body.post-php' );
+
+		// The origin post should be in a draft state.
+		$actor->seeText( 'Draft', '#post-status-display' );
+
+		// Change the remote post title and update.
+		$actor->typeInField( '#title', 'Updated test title' );
+		$actor->click( '#save-post' );
+		$actor->waitUntilElementVisible( '#wpadminbar' );
+
+		// The remote post should now in a draft status, the post status is distributed.
+		$actor->moveTo( $post_info['distributed_edit_url'] );
+		$actor->waitUntilElementVisible( 'body.post-php' );
+		$actor->seeText( 'Draft', '#post-status-display' );
+	}
+
+	/**
+	 * Create an external connection.
+	 *
+	 * @param \WPAcceptance\PHPUnit\Actor $actor The Actor instance.
+	 */
+	protected function createExternalConnection( $actor ) {
+		$actor->moveTo( 'wp-admin/post-new.php?post_type=dt_ext_connection' );
+		$actor->typeInField( '#title', 'Test External Connection' );
+		$actor->typeInField( '#dt_username', 'wpsnapshots' );
+		$actor->typeInField( '#dt_password', 'password' );
+		$actor->typeInField( '#dt_external_connection_url', $this->getWPHomeUrl() . '/two/wp-json' );
+		$actor->pressEnterKey( '#create-connection' );
+		$actor->waitUntilElementVisible( '.notice-success' );
+	}
 }

wpacceptance.json

@@ -9,5 +9,9 @@
     ],
     "enforce_clean_db": true,
     "bootstrap": "tests\/wpacceptance\/bootstrap.php",
-    "repository": "10up"
+    "repository": "10up",
+    "before_scripts" : [
+      "mv tests/test-plugins/* ../"
+    ],
+    "project_path": "%WP_ROOT%/wp-content"
 }