Comments: Add filter for comment types excluded from queries by default

src/wp-admin/includes/class-wp-comments-list-table.php

@@ -105,12 +105,33 @@ public function prepare_items() {
 			$comment_status = 'all';
 		}
 
+		/*
+		 * Notes and reactions cannot be requested as a type here, unlike other
+		 * default-excluded types. A non-string request is ignored.
+		 */
 		$comment_type = '';
 
-		if ( ! empty( $_REQUEST['comment_type'] ) && ! in_array( $_REQUEST['comment_type'], array( 'note', 'reaction' ), true ) ) {
+		if ( ! empty( $_REQUEST['comment_type'] ) && is_string( $_REQUEST['comment_type'] ) && ! in_array( $_REQUEST['comment_type'], array( 'note', 'reaction' ), true ) ) {
 			$comment_type = $_REQUEST['comment_type'];
 		}
 
+		/*
+		 * The default exclusions are passed explicitly so they still apply to an 'all'
+		 * request. The requested type is kept, so a plugin can list its own excluded
+		 * type via the 'admin_comment_types_dropdown' filter.
+		 */
+		switch ( $comment_type ) {
+			case 'pings':
+				$requested_types = array( 'pingback', 'trackback' );
+				break;
+
+			default:
+				$requested_types = array( $comment_type );
+				break;
+		}
+
+		$excluded_types = array_values( array_diff( wp_get_default_excluded_comment_types(), $requested_types ) );
+
 		$search = $_REQUEST['s'] ?? '';
 
 		$post_type = ( isset( $_REQUEST['post_type'] ) ) ? sanitize_key( $_REQUEST['post_type'] ) : '';
@@ -157,7 +178,7 @@ public function prepare_items() {
 			'number'                    => $number,
 			'post_id'                   => $post_id,
 			'type'                      => $comment_type,
-			'type__not_in'              => array( 'note', 'reaction' ),
+			'type__not_in'              => $excluded_types,
 			'orderby'                   => $orderby,
 			'order'                     => $order,
 			'post_type'                 => $post_type,

src/wp-admin/includes/comment.php

@@ -224,6 +224,8 @@ function get_comment_to_edit( $id ) {
  * @since 2.3.0
  * @since 6.9.0 Exclude the 'note' comment type from the count.
  * @since 7.2.0 Exclude the 'reaction' comment type from the count.
+ * @since 7.3.0 The excluded comment types are derived from the
+ *              {@see 'default_excluded_comment_types'} filter.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
@@ -243,7 +245,10 @@ function get_pending_comments_num( $post_id ) {
 	$post_id_array = array_map( 'intval', $post_id_array );
 	$post_id_in    = "'" . implode( "', '", $post_id_array ) . "'";
 
-	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' AND comment_type NOT IN ( 'note', 'reaction' ) GROUP BY comment_post_ID", ARRAY_A );
+	$type_not_in = wp_get_excluded_comment_types_clause();
+
+	// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- $post_id_in holds integers and $type_not_in is prepared.
+	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0'$type_not_in GROUP BY comment_post_ID", ARRAY_A );
 
 	if ( $single ) {
 		if ( empty( $pending ) ) {

src/wp-includes/class-wp-comment-query.php

@@ -66,6 +66,14 @@ class WP_Comment_Query {
 	 */
 	protected $filtered_where_clause;
 
+	/**
+	 * Comment types excluded from the results by default, or null until resolved.
+	 *
+	 * @since 7.3.0
+	 * @var string[]|null
+	 */
+	protected $default_excluded_comment_types = null;
+
 	/**
 	 * Date query container
 	 *
@@ -460,6 +468,14 @@ public function get_comments() {
 		$_args = wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) );
 		unset( $_args['fields'], $_args['update_comment_meta_cache'], $_args['update_comment_post_cache'] );
 
+		/*
+		 * The excluded set changes the results without bumping 'last_changed', so it is
+		 * part of the key. get_comment_ids() reuses it.
+		 */
+		$this->default_excluded_comment_types = wp_get_default_excluded_comment_types( $this );
+
+		$_args['default_excluded_comment_types'] = $this->default_excluded_comment_types;
+
 		$key          = md5( serialize( $_args ) );
 		$last_changed = wp_cache_get_last_changed( 'comment' );
 
@@ -550,6 +566,7 @@ public function get_comments() {
 	 * @since 4.4.0
 	 * @since 6.9.0 Excludes the 'note' comment type, unless 'all' or the 'note' types are requested.
 	 * @since 7.2.0 Excludes the 'reaction' comment type, unless 'all' or the 'reaction' types are requested.
+	 * @since 7.3.0 The default-excluded comment types are filterable via {@see 'default_excluded_comment_types'}.
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -781,11 +798,41 @@ protected function get_comment_ids() {
 			'NOT IN' => (array) $this->query_vars['type__not_in'],
 		);
 
-		// Exclude the 'note' and 'reaction' comment types, unless 'all' types or that type explicitly are requested.
+		// Resolved in get_comments() when the cache key is built; resolve here for direct calls.
+		if ( null === $this->default_excluded_comment_types ) {
+			$this->default_excluded_comment_types = wp_get_default_excluded_comment_types( $this );
+		}
+
+		$excluded_types = $this->default_excluded_comment_types;
+
+		/*
+		 * Unless 'all' is requested, exclude each default-excluded type the query does not
+		 * request. Aliases are expanded so a type requested via 'pings' stays included.
+		 */
 		if ( ! in_array( 'all', $raw_types['IN'], true ) ) {
-			foreach ( array( 'note', 'reaction' ) as $excluded_type ) {
+			$requested_types = array();
+			foreach ( $raw_types['IN'] as $requested_type ) {
+				switch ( $requested_type ) {
+					case 'comment':
+					case 'comments':
+						$requested_types[] = '';
+						$requested_types[] = 'comment';
+						break;
+
+					case 'pings':
+						$requested_types[] = 'pingback';
+						$requested_types[] = 'trackback';
+						break;
+
+					default:
+						$requested_types[] = $requested_type;
+						break;
+				}
+			}
+
+			foreach ( $excluded_types as $excluded_type ) {
 				if (
-					! in_array( $excluded_type, $raw_types['IN'], true ) &&
+					! in_array( $excluded_type, $requested_types, true ) &&
 					! in_array( $excluded_type, $raw_types['NOT IN'], true )
 				) {
 					$raw_types['NOT IN'][] = $excluded_type;

src/wp-includes/class-wp-query.php

@@ -2822,13 +2822,15 @@ public function get_posts() {
 
 		// Comments feeds.
 		if ( $this->is_comment_feed && ! $this->is_singular ) {
+			$ctype_not_in = wp_get_excluded_comment_types_clause( "{$wpdb->comments}.comment_type" );
+
 			if ( $this->is_archive || $this->is_search ) {
 				$cjoin    = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID ) $join ";
-				$cwhere   = "WHERE comment_approved = '1' AND {$wpdb->comments}.comment_type NOT IN ( 'note', 'reaction' ) $where";
+				$cwhere   = "WHERE comment_approved = '1'$ctype_not_in $where";
 				$cgroupby = "{$wpdb->comments}.comment_id";
 			} else { // Other non-singular, e.g. front.
 				$cjoin    = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID )";
-				$cwhere   = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1' AND {$wpdb->comments}.comment_type NOT IN ( 'note', 'reaction' )";
+				$cwhere   = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1'$ctype_not_in";
 				$cgroupby = '';
 			}
 
@@ -3541,11 +3543,13 @@ public function get_posts() {
 		}
 
 		if ( ! empty( $this->posts ) && $this->is_comment_feed && $this->is_singular ) {
+			$ctype_not_in = wp_get_excluded_comment_types_clause( "{$wpdb->comments}.comment_type" );
+
 			/** This filter is documented in wp-includes/class-wp-query.php */
 			$cjoin = apply_filters_ref_array( 'comment_feed_join', array( '', &$this ) );
 
 			/** This filter is documented in wp-includes/class-wp-query.php */
-			$cwhere = apply_filters_ref_array( 'comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1' AND {$wpdb->comments}.comment_type NOT IN ( 'note', 'reaction' )", &$this ) );
+			$cwhere = apply_filters_ref_array( 'comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'$ctype_not_in", &$this ) );
 
 			/** This filter is documented in wp-includes/class-wp-query.php */
 			$cgroupby = apply_filters_ref_array( 'comment_feed_groupby', array( '', &$this ) );