Changeset 4197

Timestamp:

10/07/2016 04:44:39 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Switch Contributors from being stored as post meta to a taxonomy to allow for more efficient querying.

/author/$author/ / author_name queries are now based on this taxonomy rather than by the post_author.

See #1724, #1840.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• api/routes/class-plugin.php (modified) (1 diff)
• class-plugin-directory.php (modified) (3 diffs)
• cli/class-import.php (modified) (2 diffs)
• standalone/class-plugins-info-api-request.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin.php

@@ -68 +68 @@
         $result['contributors'] = array();
 
-        $contributors = get_post_meta( $post_id, 'contributors', true ) ?: array( $post->user_login );
+        if ( $contributors = get_the_terms( $post->ID, 'plugin_contributors' ) ) {
+            $contributors = wp_list_pluck( $contributors, 'slug' );
+        } else {
+            $contributors = array();
+            if ( $author = get_user_by( 'id', $post->post_author ) ) {
+                $contributors[] = $author->user_nicename;
+            }
+        }
         foreach ( $contributors as $contributor ) {
             $user = get_user_by( 'slug', $contributor );

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -196 +196 @@
         ) );
 
-        register_taxonomy( 'plugin_tags', 'plugin', array(
+        register_taxonomy( 'plugin_contributors', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
+            'hierarchical'      => false,
+            'query_var'         => 'plugin_contributor',
+            'rewrite'           => false,
+            'labels'            => array(
+                'name' => __( 'Plugin Contributors', 'wporg-plugins' ),
+                'singular_name' => __( 'Plugin Contributor', 'wporg-plugins' ),
+            ),
+            'public'            => true,
+            'show_ui'           => true,
+            'show_admin_column' => false,
+            'capabilities'      => array(
+                'assign_terms' => 'do_not_allow',
+            ),
+        ) );
+
+        register_taxonomy( 'plugin_tags', array( 'plugin', 'force-count-to-include-all-post_status' ), array(
             'hierarchical'      => false,
             'query_var'         => 'plugin_tags',
@@ -453 +469 @@
      */
     public function pre_insert_term_prevent( $term, $taxonomy ) {
-        if ( 'plugin_tags' != $taxonomy && ! is_super_admin() ) {
+        $allowed_taxonomies = array( 'plugin_tags', 'plugin_contributors' );
+
+        if ( ! in_array( $taxonomy, $allowed_taxonomies ) && ! is_super_admin() ) {
             $term = new \WP_Error( 'not-allowed', __( 'You are not allowed to add terms.', 'wporg-plugins' ) );
         }
@@ -518 +536 @@
                 return $posts;
             }, 10, 2 );
+        }
+
+        if ( isset( $wp_query->query['author_name'] ) || isset( $wp_query->query['author'] ) ) {
+            $user = isset( $wp_query->query['author_name'] ) ? $wp_query->query['author_name'] : (get_user_by( 'id', $wp_query->query['author'])->user_nicename);
+
+            $wp_query->query_vars['plugin_contributor'] = $user;
+            $wp_query->query_vars['orderby'] = 'post_title';
+            $wp_query->query_vars['order'] = 'ASC';
+
+            unset( $wp_query->query_vars['author_name'], $wp_query->query_vars['author'] );
+
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -27 +27 @@
         'license_uri',
         'upgrade_notice',
-        'contributors',
         'screenshots'
     );
@@ -147 +146 @@
         // Set tags from the readme
         wp_set_post_terms( $plugin->ID, $readme->tags, 'plugin_tags' );
+
+        // Update the contributors list
+        wp_set_post_terms( $plugin->ID, $readme->contributors, 'plugin_contributors' );
 
         if ( in_array( 'adopt-me', $readme->tags ) ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api-request.php

@@ -164 +164 @@
             // Tags
             if ( ! empty( $this->args->tag ) ) {
-                $query['plugin_tag'] = is_array( $this->args->tag ) ? reset( $this->args->tag ) : $this->args->tag;
+                $query['plugin_tags'] = $this->args->tag;
             }
 
@@ -175 +175 @@
             if ( ! empty( $this->args->author ) ) {
                 $query['author_name'] = $this->args->author;
-                //$query['contributor_search'] = $this->args->author; // TODO
             }