Fixed the sitemap query to disregard trashed posts. (#8238)

class.jetpack-cli.php

@@ -1059,13 +1059,14 @@ public function partner_provision( $args, $named_args ) {
 	 * ## OPTIONS
 	 *
 	 * rebuild : Rebuild all sitemaps
+	 * --purge : if set, will remove all existing sitemap data before rebuilding
 	 *
 	 * ## EXAMPLES
 	 *
 	 * wp jetpack sitemap rebuild
 	 *
 	 * @subcommand sitemap
-	 * @synopsis <rebuild>
+	 * @synopsis <rebuild> [--purge]
 	 */
 	public function sitemap( $args, $assoc_args ) {
 		if ( ! Jetpack::is_active() ) {
@@ -1078,6 +1079,11 @@ public function sitemap( $args, $assoc_args ) {
 			WP_CLI::error( __( 'Jetpack Sitemaps module is active, but unavailable. This can happen if your site is set to discourage search engine indexing. Please enable search engine indexing to allow sitemap generation.', 'jetpack' ) );
 		}
 
+		if ( isset( $assoc_args['purge'] ) && $assoc_args['purge'] ) {
+			$librarian = new Jetpack_Sitemap_Librarian();
+			$librarian->delete_all_stored_sitemap_data();
+		}
+
 		$sitemap_builder = new Jetpack_Sitemap_Builder();
 		$sitemap_builder->update_sitemap();
 	}

modules/sitemaps/sitemap-librarian.php

@@ -225,10 +225,12 @@ public function query_sitemaps_after_id( $type, $from_id, $num_posts ) {
 				"SELECT *
 					FROM $wpdb->posts
 					WHERE post_type=%s
+						AND post_status=%s
 						AND ID>%d
 					ORDER BY ID ASC
 					LIMIT %d;",
 				$type,
+				'draft',
 				$from_id,
 				$num_posts
 			),