Merge pull request #294 from 10up/fix/287

Fix auto-posting tweets for automatically published posts.
10up · Nov 29, 2023 · 2bcd494 · 2bcd494
2 parents bdbdd2d + 6ae38bb
commit 2bcd494
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
 		"10up/phpcs-composer": "dev-master",
 		"phpunit/phpunit": "9.6.x-dev",
-		"yoast/phpunit-polyfills": "2.x-dev"
+		"yoast/phpunit-polyfills": "2.0.0"
 	},
 	"scripts": {
 		"test": "phpunit",

diff --git a/composer.lock b/composer.lock
diff --git a/includes/admin/assets.php b/includes/admin/assets.php
@@ -16,7 +16,6 @@
 use function TenUp\AutoshareForTwitter\Utils\autoshare_enabled;
 use function TenUp\AutoshareForTwitter\Utils\tweet_image_allowed;
 use function TenUp\AutoshareForTwitter\Utils\get_tweet_accounts;
-use function TenUp\AutoshareForTwitter\Utils\get_default_autoshare_accounts;
 use function TenUp\AutoshareForTwitter\Utils\is_local;
 
 use const TenUp\AutoshareForTwitter\Core\Post_Meta\ENABLE_AUTOSHARE_FOR_TWITTER_KEY;
@@ -190,9 +189,6 @@ function localize_data( $handle = SCRIPT_HANDLE ) {
 	$accounts       = ( new Twitter_Accounts() )->get_twitter_accounts( true );
 	$tweet_accounts = get_tweet_accounts( $post_id );
 	$tweet_body     = trim( get_autoshare_for_twitter_meta( $post_id, TWEET_BODY_KEY ) );
-	if ( empty( $tweet_accounts ) ) {
-		$tweet_accounts = get_default_autoshare_accounts();
-	}
 
 	$localization = [
 		'enabled'            => autoshare_enabled( $post_id ),

diff --git a/includes/admin/post-meta.php b/includes/admin/post-meta.php
@@ -291,9 +291,7 @@ function render_twitter_accounts( $post_id ) {
 	}
 
 	$enabled = Utils\get_tweet_accounts( $post_id );
-	if ( empty( $enabled ) ) {
-		$enabled = Utils\get_default_autoshare_accounts();
-	}
+
 	$display = ( autoshare_enabled( $post_id ) || 'publish' === $post_status ) ? '' : 'display: none;';
 	?>
 	<div class="autoshare-for-twitter-accounts-wrapper" style="<?php echo esc_attr( $display ); ?>">

diff --git a/includes/utils.php b/includes/utils.php
@@ -130,8 +130,15 @@ function tweet_image_allowed( $post_id ) {
  * @return array
  */
 function get_tweet_accounts( $post_id ) {
-	$tweet_accounts = get_autoshare_for_twitter_meta( $post_id, TWEET_ACCOUNTS_KEY );
-	if ( empty( $tweet_accounts ) ) {
+	$tweet_accounts = [];
+	if ( has_autoshare_for_twitter_meta( $post_id, TWEET_ACCOUNTS_KEY ) ) {
+		$tweet_accounts = get_autoshare_for_twitter_meta( $post_id, TWEET_ACCOUNTS_KEY );
+	} else {
+		// If post don't have meta value set for tweet accounts, use default enabled accounts to handle auto-tweet for automated posts.
+		$tweet_accounts = get_default_autoshare_accounts();
+	}
+
+	if ( ! is_array( $tweet_accounts ) ) {
 		$tweet_accounts = [];
 	}
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,6 +45,7 @@
 		"cypress-mochawesome-reporter": "^3.5.1",
 		"husky": "^3.0.5",
 		"lint-staged": "^9.2.5",
+		"mochawesome-json-to-md": "^0.7.2",
 		"node-wp-i18n": "^1.2.3"
 	},
 	"prettier": "@wordpress/prettier-config"