fix: exclude deleted/archived/spam sites from Site Query

Author: sjinks

includes/wp-cli/class-orchestrate-sites.php

@@ -60,25 +60,26 @@ public function list() {
 	 * @param int $group      Group number.
 	 */
 	private function display_sites( $num_groups = 1, $group = 0 ) {
-		$site_count = get_sites( [ 'count' => 1 ] );
+		$site_query = [
+			'archived' => 0,
+			'spam'     => 0,
+			'deleted'  => 0,
+		];
+
+		$site_count = get_sites( [ 'count' => 1 ] + $site_query );
 		if ( $site_count > 10000 ) {
 			trigger_error( 'Cron-Control: This multisite has more than 10000 subsites, currently unsupported.', E_USER_WARNING );
 		}
 
 		// Keep the query simple, then process the results.
-		$all_sites = get_sites( [ 'number' => 10000 ] );
+		$all_sites = get_sites( [ 'number' => 10000 ] + $site_query );
 		$sites_to_display = [];
 		foreach ( $all_sites as $index => $site ) {
 			if ( $index % $num_groups !== $group ) {
 				// The site does not belong to this group.
 				continue;
 			}
 
-			if ( in_array( '1', array( $site->archived, $site->spam, $site->deleted ), true ) ) {
-				// Deactivated subsites don't need cron run on them.
-				continue;
-			}
-
 			// We just need the url to display.
 			$sites_to_display[] = [ 'url' => $this->get_raw_site_url( $site->path, $site->domain ) ];
 		}