Changeset 59115 for trunk/src/wp-includes/blocks.php

Timestamp:

09/30/2024 01:17:40 AM (8 months ago)

Author:

peterwilsoncc

Message:

REST API/Editor: Support post formats in Query Block & Posts API.

Introduces post format support for both the Query Block with the new parameter format. In the build_query_vars_from_query_block() function, this is converted to a post_format taxonomy query passed to WP_Query.

Also introduces the format parameter to the REST API's Posts controller to support the feature in the Query block. The parameter type is an enumerated string accepted the post formats supported by each post type.

Props poena, mukesh27, mamaduka, noisysocks, TimothyBlynJacobs.
Fixes #62014.

File:

• trunk/src/wp-includes/blocks.php (modified) (6 diffs)

trunk/src/wp-includes/blocks.php

@@ -2336 +2336 @@
  * @since 5.8.0
  * @since 6.1.0 Added `query_loop_block_query_vars` filter and `parents` support in query.
+ * @since 6.7.0 Added support for the `format` property in query.
  *
  * @param WP_Block $block Block instance.
@@ -2348 +2349 @@
         'orderby'      => 'date',
         'post__not_in' => array(),
+        'tax_query'    => array(),
     );
 
@@ -2397 +2399 @@
         // Migrate `categoryIds` and `tagIds` to `tax_query` for backwards compatibility.
         if ( ! empty( $block->context['query']['categoryIds'] ) || ! empty( $block->context['query']['tagIds'] ) ) {
-            $tax_query = array();
+            $tax_query_back_compat = array();
             if ( ! empty( $block->context['query']['categoryIds'] ) ) {
-                $tax_query[] = array(
+                $tax_query_back_compat[] = array(
                     'taxonomy'         => 'category',
                     'terms'            => array_filter( array_map( 'intval', $block->context['query']['categoryIds'] ) ),
@@ -2406 +2408 @@
             }
             if ( ! empty( $block->context['query']['tagIds'] ) ) {
-                $tax_query[] = array(
+                $tax_query_back_compat[] = array(
                     'taxonomy'         => 'post_tag',
                     'terms'            => array_filter( array_map( 'intval', $block->context['query']['tagIds'] ) ),
@@ -2412 +2414 @@
                 );
             }
-            $query['tax_query'] = $tax_query;
+            $query['tax_query'] = array_merge( $query['tax_query'], $tax_query_back_compat );
         }
         if ( ! empty( $block->context['query']['taxQuery'] ) ) {
-            $query['tax_query'] = array();
+            $tax_query = array();
             foreach ( $block->context['query']['taxQuery'] as $taxonomy => $terms ) {
                 if ( is_taxonomy_viewable( $taxonomy ) && ! empty( $terms ) ) {
-                    $query['tax_query'][] = array(
+                    $tax_query[] = array(
                         'taxonomy'         => $taxonomy,
                         'terms'            => array_filter( array_map( 'intval', $terms ) ),
@@ -2425 +2427 @@
                 }
             }
-        }
+            $query['tax_query'] = array_merge( $query['tax_query'], $tax_query );
+        }
+        if ( ! empty( $block->context['query']['format'] ) && is_array( $block->context['query']['format'] ) ) {
+            $formats = $block->context['query']['format'];
+            /*
+             * Validate that the format is either `standard` or a supported post format.
+             * - First, add `standard` to the array of valid formats.
+             * - Then, remove any invalid formats.
+             */
+            $valid_formats = array_merge( array( 'standard' ), get_post_format_slugs() );
+            $formats       = array_intersect( $formats, $valid_formats );
+
+            /*
+             * The relation needs to be set to `OR` since the request can contain
+             * two separate conditions. The user may be querying for items that have
+             * either the `standard` format or a specific format.
+             */
+            $formats_query = array( 'relation' => 'OR' );
+
+            /*
+             * The default post format, `standard`, is not stored in the database.
+             * If `standard` is part of the request, the query needs to exclude all post items that
+             * have a format assigned.
+             */
+            if ( in_array( 'standard', $formats, true ) ) {
+                $formats_query[] = array(
+                    'taxonomy' => 'post_format',
+                    'field'    => 'slug',
+                    'operator' => 'NOT EXISTS',
+                );
+                // Remove the `standard` format, since it cannot be queried.
+                unset( $formats[ array_search( 'standard', $formats, true ) ] );
+            }
+            // Add any remaining formats to the formats query.
+            if ( ! empty( $formats ) ) {
+                // Add the `post-format-` prefix.
+                $terms = array_map(
+                    static function ( $format ) {
+                        return "post-format-$format";
+                    },
+                    $formats
+                );
+                $formats_query[] = array(
+                    'taxonomy' => 'post_format',
+                    'field'    => 'slug',
+                    'terms'    => $terms,
+                    'operator' => 'IN',
+                );
+            }
+
+            /*
+             * Add `$formats_query` to `$query`, as long as it contains more than one key:
+             * If `$formats_query` only contains the initial `relation` key, there are no valid formats to query,
+             * and the query should not be modified.
+             */
+            if ( count( $formats_query ) > 1 ) {
+                // Enable filtering by both post formats and other taxonomies by combining them with `AND`.
+                if ( empty( $query['tax_query'] ) ) {
+                    $query['tax_query'] = $formats_query;
+                } else {
+                    $query['tax_query'] = array(
+                        'relation' => 'AND',
+                        $query['tax_query'],
+                        $formats_query,
+                    );
+                }
+            }
+        }
+
         if (
             isset( $block->context['query']['order'] ) &&