<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13640] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Search: Reformat the search logic.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/13640">13640</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/13640","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-05-01 02:37:31 +0000 (Wed, 01 May 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Search: Reformat the search logic.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasspluginsearchphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-search.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2024-05-01 02:02:18 UTC (rev 13639)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2024-05-01 02:37:31 UTC (rev 13640)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -991,6 +991,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $s = trim( $s );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query->set( 's', $s );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If the search is in the block directory, require that.
+ if ( $wp_query->get( 'block_search' ) ) {
+ $wp_query->query_vars['tax_query']['plugin_section'][] = array(
+ 'taxonomy' => 'plugin_section',
+ 'field' => 'slug',
+ 'terms' => 'block',
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // By default, all archives are sorted by active installs
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasspluginsearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-search.php 2024-05-01 02:02:18 UTC (rev 13639)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-search.php 2024-05-01 02:37:31 UTC (rev 13640)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,6 +136,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $module;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Localise the ES fields searched for localised queries.
+ */
+ public function localise_es_fields( $fields ) {
+ $localised_prefixes = [
+ 'all_content',
+ 'title',
+ 'excerpt',
+ 'description',
+ ];
+
+ $localised_fields = array();
+
+ foreach ( (array) $fields as $field ) {
+ // title.ngram
+ list( $field, $type ) = explode( '.', $field . '.' );
+ if ( $type ) {
+ $type = ".{$type}";
+ }
+
+ if ( ! in_array( $field, $localised_prefixes ) ) {
+ $localised_fields[] = $field . $type;
+ continue;
+ }
+
+ if ( $this->is_english ) {
+ $localised_fields[] = $field . '_en' . $type;
+ continue;
+ }
+
+ $boost = '';
+ $en_boost = '^' . $this->en_boost;
+ if ( 'description' === $field ) {
+ $boost = '^' . $this->desc_boost;
+ $en_boost = '^' . $this->desc_en_boost;
+ }
+
+ $localised_fields[] = $field . '_' . $this->locale . $type . $boost;
+ $localised_fields[] = $field . '_en' . $type . $en_boost;
+ }
+
+ return $localised_fields;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function jetpack_search_es_wp_query_args( $args, $query ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Block Search.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,19 +208,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->locale = get_locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_english = ( ! $this->locale || str_starts_with( $this->locale, 'en_' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->is_english ) {
- $matching_fields = array(
- 'all_content_en',
- );
- } else {
- $matching_fields = array(
- 'all_content_' . $this->locale,
- 'all_content_en^' . $this->en_boost,
- );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['query_fields'] = $this->localise_es_fields( 'all_content' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['query_fields'] = $matching_fields;
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,192 +238,161 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set boost on the match query
-
- if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'must' ][0][ 'multi_match' ] ) ) {
- $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'must' ][0][ 'multi_match' ][ 'boost' ] = 0.1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The should match is where we add the fields to be searched in, and the weighting of them (boost).
+ $should_match = [];
+ if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ] ) ) {
+ $should_match = & $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Old version had one less level here. Probably unimportant but this makes the unit tests pass.
- if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'must' ][0] ) ) {
- $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'must' ] = $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'must' ][0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $search_phrase = $should_match[0][ 'multi_match' ][ 'query' ] ?? '';
+
+ // The function score is where calculations on fields occur.
+ $function_score = [];
+ if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'functions' ] ) ) {
+ $function_score = & $es_query_args[ 'query' ][ 'function_score' ][ 'functions' ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Not sure if this matters, but again it's in the tests
- if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][0][ 'multi_match' ][ 'operator' ] ) ) {
- unset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][0][ 'multi_match' ][ 'operator' ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set boost on the match query, from jetpack_search_es_wp_query_args.
+ if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'must' ][0][ 'multi_match' ] ) ) {
+ $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'must' ][0][ 'multi_match' ][ 'boost' ] = 0.1;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Some extra fields here
- if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][0][ 'multi_match' ] ) ) {
- $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][0][ 'multi_match' ][ 'boost' ] = 2;
- $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][0][ 'multi_match' ][ 'fields' ] = ( $this->is_english ? [
- 0 => 'title_en',
- 1 => 'excerpt_en',
- 2 => 'description_en^1',
- 3 => 'taxonomy.plugin_tags.name',
- ] : [
- 'title_' . $this->locale,
- 'excerpt_' . $this->locale,
- 'description_' . $this->locale . '^' . $this->desc_boost,
- 'title_en^' . $this->en_boost,
- 'excerpt_en^' . $this->en_boost,
- 'description_en^' . $this->desc_en_boost,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This extends the search to additionally search in the title, excerpt, description and plugin_tags.
+ if ( isset( $should_match[0][ 'multi_match' ] ) ) {
+ $should_match[0][ 'multi_match' ][ 'boost' ] = 2;
+ $should_match[0][ 'multi_match' ][ 'fields' ] = $this->localise_es_fields( [
+ 'title',
+ 'excerpt',
+ 'description',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy.plugin_tags.name',
</span><span class="cx" style="display: block; padding: 0 10px"> ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // And some more fancy bits here
- if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ] ) && 1 === count( $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ] ) ) {
- $search_phrase = $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][0][ 'multi_match' ][ 'query' ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Setup the boosting for various fields.
+ $should_match[] = [
+ 'multi_match' => [
+ 'query' => $search_phrase,
+ 'fields' => $this->localise_es_fields( [ 'title.ngram' ] ),
+ 'type' => 'phrase',
+ 'boost' => 2,
+ ],
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][] = [
- 'multi_match' => [
- 'query' => $search_phrase,
- 'fields' => ( $this->is_english ? [
- 0 => 'title_en.ngram',
- ] : [
- 'title_' . $this->locale . '.ngram',
- 'title_en.ngram^' . $this->en_boost,
- ] ),
- 'type' => 'phrase',
- 'boost' => 2,
- ],
- ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // A direct slug match
+ $should_match[] = [
+ 'multi_match' => [
+ 'query' => $search_phrase,
+ 'fields' => $this->localise_es_fields( 'title', 'slug_text' ),
+ 'type' => 'most_fields',
+ 'boost' => 5,
+ ],
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][] = [
- 'multi_match' => [
- 'query' => $search_phrase,
- 'fields' => ( $this->is_english ? [
- 0 => 'title_en',
- 1 => 'slug_text',
- ] : [
- 'title_' . $this->locale,
- 'title_en^' . $this->en_boost,
- 'slug_text',
- ] ),
- 'type' => 'most_fields',
- 'boost' => 5,
- ],
- ];
-
- $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][] = [
- 'multi_match' => [
- 'query' => $search_phrase,
- 'fields' => ( $this->is_english ? [
- 0 => 'excerpt_en',
- 1 => 'description_en^1',
- 2 => 'taxonomy.plugin_tags.name',
- ] : [
- 'excerpt_' . $this->locale,
- 'description_' . $this->locale . '^' . $this->desc_boost,
- 'excerpt_en^' . $this->en_boost,
- 'description_en^' . $this->desc_en_boost,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $should_match[] = [
+ 'multi_match' => [
+ 'query' => $search_phrase,
+ 'fields' => $this->localise_es_fields( [
+ 'excerpt',
+ 'description',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy.plugin_tags.name',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ] ),
- 'type' => 'best_fields',
- 'boost' => 2,
- ],
- ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ] ),
+ 'type' => 'best_fields',
+ 'boost' => 2,
+ ],
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $es_query_args[ 'query' ][ 'function_score' ][ 'query' ][ 'bool' ][ 'should' ][] = [
- 'multi_match' => [
- 'query' => $search_phrase,
- 'fields' => [
- 0 => 'author',
- 1 => 'contributors',
- ],
- 'type' => 'best_fields',
- 'boost' => 2,
- ],
- ];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $should_match[] = [
+ 'multi_match' => [
+ 'query' => $search_phrase,
+ 'fields' => $this->localise_es_fields( [
+ 'author',
+ 'contributor'
+ ] ),
+ 'type' => 'best_fields',
+ 'boost' => 3,
+ ],
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $es_query_args[ 'query' ][ 'function_score' ][ 'functions' ] ) ) {
- $es_query_args[ 'query' ][ 'function_score' ][ 'functions' ] = [
- 0 => [
- 'exp' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // We'll overwrite the default Jetpack Search function scoring with our own.
+ $function_score = [
+ [
+ // The more recent a plugin was updated, the more relevant it is.
+ 'exp' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin_modified' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'origin' => date('Y-m-d'),
- 'offset' => '180d',
- 'scale' => '360d',
- 'decay' => 0.5,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'origin' => date('Y-m-d'),
+ 'offset' => '180d',
+ 'scale' => '360d',
+ 'decay' => 0.5,
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ],
- ],
- 1 => [
- 'exp' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ]
+ ],
+ [
+ // The older a plugins tested-up-to is, the less likely it's relevant.
+ 'exp' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tested' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'origin' => '5.0',
- 'offset' => 0.1,
- 'scale' => 0.4,
- 'decay' => 0.6,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'origin' => '5.0',
+ 'offset' => 0.1,
+ 'scale' => 0.4,
+ 'decay' => 0.6,
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ],
</del><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 2 => [
- 'field_value_factor' => [
- 'field' => 'active_installs',
- 'factor' => 0.375,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ],
+ [
+ // A higher install base is a sign that the plugin will be relevant to the searcher.
+ 'field_value_factor' => [
+ 'field' => 'active_installs',
+ 'factor' => 0.375,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'modifier' => 'log2p',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'missing' => 1,
- ],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'missing' => 1,
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3 => [
- 'filter' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ],
+ [
+ // For plugins with less than 1 million installs, we need to adjust their scores a bit more.
+ 'filter' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'range' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'active_installs' => [
- 'lte' => 1000000,
- ],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'active_installs' => [
+ 'lte' => 1000000,
+ ],
+ ],
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ],
- 'exp' => [
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exp' => [
</ins><span class="cx" style="display: block; padding: 0 10px"> 'active_installs' => [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'origin' => 1000000,
- 'offset' => 0,
- 'scale' => 900000,
- 'decay' => 0.75,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'origin' => 1000000,
+ 'offset' => 0,
+ 'scale' => 900000,
+ 'decay' => 0.75,
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ],
</del><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 4 => [
- 'field_value_factor' => [
- 'field' => 'support_threads_resolved',
- 'factor' => 0.25,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ],
+ [
+ // The more resolved support threads (as a percentage) a plugin has, the more responsive the developer is, and the better experience the end-user will have.
+ 'field_value_factor' => [
+ 'field' => 'support_threads_resolved',
+ 'factor' => 0.25,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'modifier' => 'log2p',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'missing' => 0.5,
- ],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'missing' => 0.5,
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 5 => [
- 'field_value_factor' => [
- 'field' => 'rating',
- 'factor' => 0.25,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ],
+ [
+ // A higher rated plugin is more likely to be preferred.
+ 'field_value_factor' => [
+ 'field' => 'rating',
+ 'factor' => 0.25,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'modifier' => 'sqrt',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'missing' => 2.5,
- ],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'missing' => 2.5,
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ],
+ ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Old version didn't have these
</del><span class="cx" style="display: block; padding: 0 10px"> unset( $es_query_args[ 'query' ][ 'function_score' ][ 'score_mode' ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $es_query_args[ 'query' ][ 'function_score' ][ 'max_boost' ] );
- unset( $es_query_args[ 'aggregations' ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $es_query_args[ 'query' ][ 'function_score' ][ 'boost_mode' ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Couple of extra fields wanted in the response, mainly for debugging
</span><span class="cx" style="display: block; padding: 0 10px"> $es_query_args[ 'fields' ] = [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0 => 'slug',
- 1 => 'post_id',
- 2 => 'blog_id',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'slug',
+ 'post_id',
</ins><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Old version had things wrapped in an extra query => filtered layer.
- $es_query_args[ 'query' ] = [
- 'filtered' => [
- 'query' => $es_query_args[ 'query' ]
- ]
- ];
-
</del><span class="cx" style="display: block; padding: 0 10px"> return $es_query_args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>