Changeset 3550 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php

Timestamp:

06/22/2016 02:49:08 PM (10 years ago)

Author:

tellyworth

Message:

Plugin directory: implement a simple recommended plugins API response using Elasticsearch.

This returns a list of plugins with the following criteria:

• Not already installed
• Tested-up-to is close to the requesting site's WP version
• Scoring accounts for similar factors as a regular search

See #1729

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/libs/site-search/jetpack-search.php

@@ -248 +248 @@
 
         // ES API does not allow more than 15 results at a time
-        if ( $posts_per_page > 15 )
-            $posts_per_page = 15;
+        if ( $posts_per_page > 200 )
+            $posts_per_page = 200;
 
         $date_cutoff = strftime( '%Y-%m-%d', strtotime( '-2 years' ) );
         $date_today = strftime( '%Y-%m-%d' );
         $version_cutoff = ( defined('WP_CORE_STABLE_BRANCH') ? sprintf( '%0.1f', WP_CORE_STABLE_BRANCH - 0.5) : '4.0' );
+
+        // If the request comes from WordPress and the major version string looks sane, use a more specific version constraint
+        if ( preg_match( '|WordPress/(\d+[.]\d+)|', $_SERVER['HTTP_USER_AGENT'], $matches ) ) {
+            if ( $matches[1] >= $version_cutoff && $matches[1] <= WP_CORE_STABLE_BRANCH ) {
+                $version_cutoff = sprintf( '%0.1f', $matches[1] - 0.2 );
+            }
+        }
 
         // Start building the WP-style search query args
@@ -272 +279 @@
         );
 
+        if ( defined( 'WPORG_IS_API' ) && WPORG_IS_API ) {
+            // Look for plugins excluding those already installed
+            if ( isset( $query->query['installed_plugins'] ) ) {
+                $es_wp_query_args['filters'][] = array( 'not' => array( 'terms' => array( 'slug' => $query->query['installed_plugins'] ) ) );
+            }
+        }
+        
         $locale = get_locale();
         if ( $locale && $locale !== 'en' && $locale !== 'en_US' ) {
@@ -327 +341 @@
 
     public function action__pre_get_posts( $query ) {
+        // Treat an API request for the recommended tab as a search, even though there is no search string in the query
+        if ( defined( 'WPORG_IS_API' ) && WPORG_IS_API && isset( $query->query['browse'] ) && $query->query['browse'] === 'recommended' )
+            $query->is_search = true;
+
         if ( ! $query->is_main_query() || ! $query->is_search() )
             return;
@@ -610 +628 @@
             }
         } else {
+            $query = array( 'match_all' => array() );
+            $es_query_args['query'] = Jetpack_Search::score_query_by_recency( $query );
             if ( ! $args['orderby'] ) {
                 $args['orderby'] = array( 'date' );