@automattic/newspack-blocks 4.4.0-alpha.1 → 4.4.0-alpha.2

package/CHANGELOG.md

@@ -1,10 +1,9 @@
-# [4.4.0-alpha.1](https://github.com/Automattic/newspack-blocks/compare/v4.3.5...v4.4.0-alpha.1) (2024-11-15)
+# [4.4.0-alpha.2](https://github.com/Automattic/newspack-blocks/compare/v4.4.0-alpha.1...v4.4.0-alpha.2) (2024-11-18)
 
 
-### Features
+### Bug Fixes
 
-* **donate-block:** hide buttons if only one frequency is available ([#1853](https://github.com/Automattic/newspack-blocks/issues/1853)) ([043591e](https://github.com/Automattic/newspack-blocks/commit/043591efef1278575fabeac1bc99000db7a63ed6))
-* **homepage-articles:** rename block and reorganise settings ([#1943](https://github.com/Automattic/newspack-blocks/issues/1943)) ([1af11a4](https://github.com/Automattic/newspack-blocks/commit/1af11a45742dd313c2cbe35c9af8da479c9cb569))
+* trigger release with HPP fix ([2c8c1e6](https://github.com/Automattic/newspack-blocks/commit/2c8c1e6030e6a2b0777ee2756bb2d7196f74fca9))
 
 ## [4.3.5](https://github.com/Automattic/newspack-blocks/compare/v4.3.4...v4.3.5) (2024-11-11)
 

package/includes/class-newspack-blocks.php

@@ -674,19 +674,16 @@ class Newspack_Blocks {
 				}
 			}
 
-			$is_co_authors_plus_active = class_exists( 'CoAuthors_Guest_Authors' );
+			$is_co_authors_plus_active = class_exists( 'CoAuthors_Plus' );
+			$co_authors_guest_authors = class_exists( 'CoAuthors_Guest_Authors' ) ? new CoAuthors_Guest_Authors() : null;
 
 			if ( $authors && count( $authors ) ) {
 				$co_authors_names = [];
-				$author_names     = [];
-				$author_emails    = [];
 
 				if ( $is_co_authors_plus_active ) {
-					$co_authors_guest_authors = new CoAuthors_Guest_Authors();
-
 					foreach ( $authors as $index => $author_id ) {
 						// If the given ID is a guest author.
-						$co_author = $co_authors_guest_authors->get_guest_author_by( 'id', $author_id );
+						$co_author = $co_authors_guest_authors ? $co_authors_guest_authors->get_guest_author_by( 'id', $author_id ) : null;
 						if ( $co_author ) {
 							if ( ! empty( $co_author->linked_account ) ) {
 								$linked_account = get_user_by( 'login', $co_author->linked_account );
@@ -697,20 +694,23 @@ class Newspack_Blocks {
 							$co_authors_names[] = $co_author->user_nicename;
 							unset( $authors[ $index ] );
 						} else {
-							// If the given ID is linked to a guest author.
 							$authors_controller = new WP_REST_Newspack_Authors_Controller();
 							$author_data        = get_userdata( $author_id );
 							if ( $author_data ) {
 								$linked_guest_author = $authors_controller->get_linked_guest_author( $author_data->user_login );
+								// If the given ID is linked to a guest author.
 								if ( $linked_guest_author ) {
 									$guest_author_name = sanitize_title( $linked_guest_author->post_title );
 									if ( ! in_array( $guest_author_name, $co_authors_names, true ) ) {
 										$co_authors_names[] = $guest_author_name;
+										$co_authors_names[] = $linked_guest_author->post_name;
 										unset( $authors[ $index ] );
 									}
 								} else {
-									$author_names[]  = $author_data->user_login;
-									$author_emails[] = $author_data->user_email;
+									$co_authors_names[]  = $author_data->user_login;
+									$co_authors_names[]  = $author_data->user_nicename;
+									$co_authors_names[]  = 'cap-' . $author_data->user_nicename;
+									$co_authors_names[] = $author_data->user_email;
 								}
 							}
 						}
@@ -719,9 +719,16 @@ class Newspack_Blocks {
 
 				// Reset numeric indexes.
 				$authors = array_values( $authors );
+
 				if ( empty( $authors ) && count( $co_authors_names ) ) {
-					// Look for co-authors posts.
+					// We are only looking for Guest Authors posts. So we need to only search by taxonomy.
 					$args['tax_query'] = [ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query
+						'relation' => 'OR',
+						[
+							'field'    => 'slug',
+							'taxonomy' => 'author',
+							'terms'    => $co_authors_names,
+						],
 						[
 							'field'    => 'name',
 							'taxonomy' => 'author',
@@ -729,32 +736,11 @@ class Newspack_Blocks {
 						],
 					];
 				} elseif ( empty( $co_authors_names ) && count( $authors ) ) {
+					// Simple search by author. Co-Authors plus is not active.
 					$args['author__in'] = $authors;
-
-					if ( $is_co_authors_plus_active ) {
-						// Don't get any posts that are attributed to other CAP guest authors.
-						$args['tax_query'] = [ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query
-							[
-								'relation' => 'OR',
-								[
-									'taxonomy' => 'author',
-									'operator' => 'NOT EXISTS',
-								],
-								[
-									'field'    => 'name',
-									'taxonomy' => 'author',
-									'terms'    => $author_names,
-								],
-								[
-									'field'    => 'name',
-									'taxonomy' => 'author',
-									'terms'    => $author_emails,
-								],
-							],
-						];
-					}
 				} else {
 					// The query contains both WP users and CAP guest authors. We need to filter the SQL query.
+					// That's because author__in and tax_query would be combined with AND, not OR.
 					self::$filter_clauses = [
 						'authors'   => $authors,
 						'coauthors' => $co_authors_names,
@@ -1254,11 +1240,17 @@ class Newspack_Blocks {
 
 		// co-author tax query.
 		$tax_query = [
+			'relation' => 'OR',
 			[
 				'taxonomy' => 'author',
 				'field'    => 'name',
 				'terms'    => $co_authors_names,
 			],
+			[
+				'taxonomy' => 'author',
+				'field'    => 'slug',
+				'terms'    => $co_authors_names,
+			],
 		];
 
 		// Generate the tax query SQL.

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         4.4.0-alpha.1
+ * Version:         4.4.0-alpha.2
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '4.4.0-alpha.1' );
+define( 'NEWSPACK_BLOCKS__VERSION', '4.4.0-alpha.2' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "4.4.0-alpha.1",
+	"version": "4.4.0-alpha.2",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.10.4",

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit2cf99a59d97a08e424ba39157d0270a1::getLoader();
+return ComposerAutoloaderInit9ce91122910c3bd565085a142c12af0b::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit2cf99a59d97a08e424ba39157d0270a1
+class ComposerAutoloaderInit9ce91122910c3bd565085a142c12af0b
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInit2cf99a59d97a08e424ba39157d0270a1
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit2cf99a59d97a08e424ba39157d0270a1', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit9ce91122910c3bd565085a142c12af0b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit2cf99a59d97a08e424ba39157d0270a1', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit9ce91122910c3bd565085a142c12af0b', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit2cf99a59d97a08e424ba39157d0270a1::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit9ce91122910c3bd565085a142c12af0b::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit2cf99a59d97a08e424ba39157d0270a1
+class ComposerStaticInit9ce91122910c3bd565085a142c12af0b
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInit2cf99a59d97a08e424ba39157d0270a1
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInit2cf99a59d97a08e424ba39157d0270a1::$classMap;
+            $loader->classMap = ComposerStaticInit9ce91122910c3bd565085a142c12af0b::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => '2d477773224f9e3ddcd38319aa3786870e50db60',
+        'reference' => 'a65c1df33e81153efa79381f8c023275c94ce476',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => '2d477773224f9e3ddcd38319aa3786870e50db60',
+            'reference' => 'a65c1df33e81153efa79381f8c023275c94ce476',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),