chore(release): merge in release v1.46.1

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.46.1](https://github.com/Automattic/newspack-newsletters/compare/v1.46.0...v1.46.1) (2022-05-25)
+
+
+### Bug Fixes
+
+* sending scheduled newsletters ([#831](https://github.com/Automattic/newspack-newsletters/issues/831)) ([f2028fb](https://github.com/Automattic/newspack-newsletters/commit/f2028fb7fd98163e78c00bc5c35bef20a05fde9f))
+
+## [1.46.1-hotfix.1](https://github.com/Automattic/newspack-newsletters/compare/v1.46.0...v1.46.1-hotfix.1) (2022-05-25)
+
+
+### Bug Fixes
+
+* sending scheduled newsletters ([2a25225](https://github.com/Automattic/newspack-newsletters/commit/2a25225f79e032ae454fe3e47fd40708f3b8c6e9))
+
 # [1.46.0](https://github.com/Automattic/newspack-newsletters/compare/v1.45.0...v1.46.0) (2022-05-18)
 
 

includes/class-newspack-newsletters.php

@@ -1300,6 +1300,10 @@ public static function set_newsletter_sent( $post_id, $time = 0 ) {
 	 * @return false|int False if not sent, or timestamp of when it was sent.
 	 */
 	public static function is_newsletter_sent( $post_id ) {
+		$scheduling_error = get_transient( sprintf( 'newspack_newsletters_scheduling_error_%s', $post_id ) );
+		if ( $scheduling_error ) {
+			return false;
+		}
 		$sent = get_post_meta( $post_id, 'newsletter_sent', true );
 		if ( 0 < $sent ) {
 			return $sent;

includes/service-providers/class-newspack-newsletters-service-provider.php

@@ -50,6 +50,7 @@ public function __construct() {
 			add_action( 'rest_api_init', [ $this->controller, 'register_routes' ] );
 		}
 		add_action( 'pre_post_update', [ $this, 'pre_post_update' ], 10, 2 );
+		add_action( 'transition_post_status', [ $this, 'transition_post_status' ], 10, 3 );
 		add_filter( 'wp_insert_post_data', [ $this, 'insert_post_data' ], 10, 2 );
 	}
 
@@ -116,13 +117,8 @@ public function pre_post_update( $post_id, $data ) {
 			wp_die( $error ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		}
 
-		// Send if changing from any status to controlled statuses - 'publish' or 'private'.
-		if (
-			! $sent &&
-			$old_status !== $new_status &&
-			in_array( $new_status, self::$controlled_statuses, true ) && 
-			! in_array( $old_status, self::$controlled_statuses, true )
-		) {
+		// Send if changing from any status to publish.
+		if ( ! $sent && 'publish' === $new_status && 'publish' !== $old_status ) {
 			$result = $this->send_newsletter( $post );
 			if ( is_wp_error( $result ) ) {
 				$transient = sprintf( 'newspack_newsletters_error_%s_%s', $post->ID, get_current_user_id() );
@@ -132,6 +128,40 @@ public function pre_post_update( $post_id, $data ) {
 		}
 	}
 
+	/**
+	 * Handle post status transition for scheduled newsletters.
+	 *
+	 * This is executed after the post is updated.
+	 *
+	 * Scheduling a post (future -> publish) does not trigger the
+	 * `pre_post_update` action hook because it uses the `wp_publish_post()`
+	 * function. Unfortunately, this function does not fire any action hook prior
+	 * to updating the post, so, for this case, we need to handle sending after
+	 * the post is published.
+	 *
+	 * @param string  $new_status New post status.
+	 * @param string  $old_status Old post status.
+	 * @param WP_Post $post       Post object.
+	 */
+	public function transition_post_status( $new_status, $old_status, $post ) {
+		if ( 'publish' === $new_status && 'future' === $old_status ) {
+			$result              = $this->send_newsletter( $post );
+			$error_transient_key = sprintf( 'newspack_newsletters_scheduling_error_%s', $post->ID );
+			if ( is_wp_error( $result ) ) {
+				set_transient( $error_transient_key, $result->get_error_message() );
+				wp_update_post(
+					[
+						'ID'          => $post->ID,
+						'post_status' => 'draft',
+					] 
+				);
+				wp_die( $result ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			} else {
+				delete_transient( $error_transient_key );
+			}
+		}
+	}
+
 	/**
 	 * Handle newsletter post status changes.
 	 *

newspack-newsletters.php

@@ -6,7 +6,7 @@
  * Author:          Automattic
  * Text Domain:     newspack-newsletters
  * Domain Path:     /languages
- * Version:         1.46.0
+ * Version:         1.46.1
  *
  * @package         Newspack_Newsletters
  */

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "newspack-newsletters",
-	"version": "1.46.0",
+	"version": "1.46.1",
 	"description": "",
 	"scripts": {
 		"cm": "newspack-scripts commit",

src/components/send-button/index.js

@@ -133,7 +133,7 @@ export default compose( [
 				? __( 'Mark as sent and publish', 'newspack-newsletters' )
 				: __( 'Mark as sent', 'newspack-newsletters' );
 		} else {
-			modalSubmitLabel = __( 'Send', 'newspack-newsletters' );
+			modalSubmitLabel = label;
 		}
 
 		useEffect( () => {

src/service-providers/constant_contact/index.js

@@ -51,7 +51,7 @@ const renderPreSendInfo = newsletterData => {
 
 	return (
 		<p>
-			{ __( "You're about to send a newsletter to:", 'newspack-newsletters' ) }
+			{ __( "You're sending a newsletter to:", 'newspack-newsletters' ) }
 			<br />
 			<strong>{ campaignLists.map( list => list.name ).join( ', ' ) }</strong>
 			<br />

src/service-providers/mailchimp/index.js

@@ -67,7 +67,7 @@ const renderPreSendInfo = newsletterData => {
 
 	return (
 		<p>
-			{ __( "You're about to send a newsletter to:", 'newspack-newsletters' ) }
+			{ __( "You're sending a newsletter to:", 'newspack-newsletters' ) }
 			<br />
 			<strong>{ listData.name }</strong>
 			<br />