tweak: add new action hooks and deprecated existing

includes/classes/ExternalConnections/WordPressExternalConnection.php

@@ -706,7 +706,28 @@ public function push( $post, $args = array() ) {
 		);
 
 		// Action documented in includes/classes/InternalConnections/NetworkSiteConnection.php.
-		do_action( 'dt_push_post', $response, $post_body, $type_url, $post_id, $args, $this );
+		do_action_deprecated(
+			'dt_push_post',
+			array( $response, $post_body, $type_url, $post_id, $args, $this ),
+			'2.0.0',
+			'dt_push_network_post|dt_push_external_post',
+			esc_html__( 'The dt_push_post action has been deprecated. Please use dt_push_network_post or dt_push_external_post instead.', 'distributor' )
+		);
+
+		/**
+		 * Fires the action after a post is pushed via Distributor before remote request validation.
+		 *
+		 * @since 2.0.0
+		 * @hook  dt_push_external_post
+		 *
+		 * @param {array|WP_Error}              $response    The response from the remote request.
+		 * @param {array}                       $post_body   The Post data formatted for the REST API endpoint.
+		 * @param {string}                      $type_url    The Post type api endpoint.
+		 * @param {int}                         $post_id     The Post id.
+		 * @param {array}                       $args        The arguments passed into wp_insert_post.
+		 * @param {WordPressExternalConnection} $this        The Distributor connection being pushed to.
+		 */
+		do_action( 'dt_push_external_post', $response, $post_body, $type_url, $post_id, $args, $this );
 
 		if ( is_wp_error( $response ) ) {
 			return $response;

includes/classes/InternalConnections/NetworkSiteConnection.php

@@ -124,14 +124,35 @@ public function push( $post, $args = array() ) {
 			/**
 			 * Fires after a post is pushed via Distributor before `restore_current_blog()`.
 			 *
-			 * @hook dt_push_post
+			 * @since 1.2.2
+			 * @deprecated 2.0.0 The dt_push_post action has been deprecated. Please use dt_push_network_post or dt_push_external_post instead.
+			 * @hook  dt_push_post
 			 *
-			 * @param {int}        $new_post_id   The newly created post ID.
-			 * @param {int}        $post_id       The original post ID.
-			 * @param {array}      $args          The arguments passed into wp_insert_post.
-			 * @param {Connection} $this          The Distributor connection being pushed to.
+			 * @param {int}        $new_post_id The newly created post.
+			 * @param {int}        $post_id     The original post.
+			 * @param {array}      $args        The arguments passed into wp_insert_post.
+			 * @param {Connection} $this        The Distributor connection being pushed to.
 			 */
-			do_action( 'dt_push_post', $new_post_id, $post_id, $args, $this );
+			do_action_deprecated(
+				'dt_push_post',
+				array( $new_post_id, $post_id, $args, $this ),
+				'2.0.0',
+				'dt_push_network_post|dt_push_external_post',
+				esc_html__( 'The dt_push_post action has been deprecated. Please use dt_push_network_post or dt_push_external_post instead.', 'distributor' )
+			);
+
+			/**
+			 * Fires the action after a post is pushed via Distributor before `restore_current_blog()`.
+			 *
+			 * @since 2.0.0
+			 * @hook  dt_push_network_post
+			 *
+			 * @param {int}                   $new_post_id The newly created post.
+			 * @param {int}                   $post_id     The original post.
+			 * @param {array}                 $args        The arguments passed into wp_insert_post.
+			 * @param {NetworkSiteConnection} $this        The Distributor connection being pushed to.
+			 */
+			do_action( 'dt_push_network_post', $new_post_id, $post_id, $args, $this );
 
 			restore_current_blog();
 
@@ -206,7 +227,16 @@ public function push( $post, $args = array() ) {
 		}
 
 		/** This filter is documented in includes/classes/InternalConnections/NetworkSiteConnection.php */
-		do_action( 'dt_push_post', $new_post_id, $post_id, $args, $this );
+		do_action_deprecated(
+			'dt_push_post',
+			array( $new_post_id, $post_id, $args, $this ),
+			'2.0.0',
+			'dt_push_network_post|dt_push_external_post',
+			esc_html__( 'The dt_push_post action has been deprecated. Please use dt_push_network_post or dt_push_external_post instead.', 'distributor' )
+		);
+
+		/** This filter is documented in includes/classes/InternalConnections/NetworkSiteConnection.php */
+		do_action( 'dt_push_network_post', $new_post_id, $post_id, $args, $this );
 
 		restore_current_blog();
 

includes/utils.php

@@ -846,11 +846,11 @@ function process_media( $url, $post_id, $args = [] ) {
 	 * @since 1.3.7
 	 * @hook dt_media_processing_filename
 	 *
-	 * @param {string} $media_name Filemame of the media being processed.
+	 * @param {string} $media_name Filename of the media being processed.
 	 * @param {string} $url        Media url.
 	 * @param {int}    $post_id    Post ID.
 	 *
-	 * @return {string} Filemame of the media being processed.
+	 * @return {string} Filename of the media being processed.
 	 */
 	$media_name = apply_filters( 'dt_media_processing_filename', $media_name, $url, $post_id );
 

tests/php/NetworkSiteConnectionsTest.php

@@ -109,6 +109,7 @@ public function test_push() {
 			)
 		);
 
+		\WP_Mock::userFunction( 'do_action_deprecated' );
 		\WP_Mock::userFunction( 'get_current_user_id' );
 		\WP_Mock::userFunction( 'switch_to_blog' );
 		\WP_Mock::userFunction( 'add_filter' );

tests/php/WordPressExternalConnectionTest.php

@@ -80,6 +80,7 @@ public function test_construct() {
 	 */
 	public function test_push() {
 		$this->setup_post_meta_mock( array() );
+		\WP_Mock::userFunction( 'do_action_deprecated' );
 		\WP_Mock::userFunction( 'untrailingslashit' );
 		\WP_Mock::userFunction( 'get_the_title' );
 		\WP_Mock::userFunction( 'wp_remote_post' );
@@ -129,7 +130,6 @@ public function test_push() {
 			'post_excerpt' => 'post excerpt',
 			'post_name'    => 'slug',
 			'post_status'  => 'publish',
-			'post_type'    => $post_type,
 			'ID'           => 1,
 		];