Ticket #2699: 2699.patch

wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-directory-compat.php

@@ -23 +23 @@
         var $loaded       = false;
         var $authors      = null;
         var $contributors = null;
+        var $support_reps = null;
         var $query        = null;
         var $term         = null;
 
@@ -316 +317 @@
                                 $this->{$this->compat()} = $this->get_object( $slug );
                                 $this->authors           = $this->get_authors( $slug );
                                 $this->contributors      = $this->get_contributors( $slug );
+                                $this->support_reps      = $this->get_support_reps( $slug );
                                 $this->term              = $terms[0];
 
                                 // Add output filters and actions.
@@ -331 +333 @@
 
                                 // Instantiate WPORG_Stickies mode for topic view.
                                 if ( class_exists( 'WordPressdotorg\Forums\Stickies_Compat' ) ) {
-                                        $this->stickies = new Stickies_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ), $this->term, $this->authors, $this->contributors );
+                                        $this->stickies = new Stickies_Compat( $this->compat(), $this->slug(), $this->taxonomy(), $this->get_object( $this->slug() ), $this->term, $this->authors, $this->contributors, $this->support_reps );
                                 }
 
                                 $this->loaded = true;
@@ -357 +359 @@
                 ||
                         ( ! empty( $this->contributors ) && in_array( $user->user_nicename, $this->contributors ) )
                 || 
-                        ( is_a( $user, 'WP_User' ) && $user->supportrep == $this->slug() )
+                        ( ! empty( $this->support_reps ) && in_array( $user->user_nicename, $this->support_reps ) )
                 ) {
                         $retval = true;
                 }
@@ -901 +903 @@
                 }
                 return $contributors;
         }
+
+        public function get_support_reps( $slug ) {
+                global $wpdb;
+
+                if ( null !== $this->support_reps ) {
+                        return $this->support_reps;
+                }
+
+                // Themes do not have support reps right now.
+                if ( $this->compat() == 'theme' ) {
+                        $support_reps = array();
+                        return $support_reps;
+                }
+
+                // Check the cache.
+                $cache_key = $slug;
+                $cache_group = $this->compat() . '-support-reps-slugs';
+                $support_reps = wp_cache_get( $cache_key, $cache_group );
+                if ( ! $support_reps ) {
+                        $plugin = $this->get_object( $slug );
+                        $prefix = $wpdb->base_prefix . WPORG_PLUGIN_DIRECTORY_BLOGID . '_';
+                        $support_reps = $wpdb->get_col( $wpdb->prepare(
+                                "SELECT slug
+                                 FROM {$prefix}terms AS t
+                                 LEFT JOIN {$prefix}term_taxonomy AS tt ON tt.term_id = t.term_id
+                                 LEFT JOIN {$prefix}term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id 
+                                 WHERE tt.taxonomy = 'plugin_support_reps' AND tr.object_id = %d",
+                                 $plugin->ID
+                        ) );
+
+                        wp_cache_set( $cache_key, $support_reps, $cache_group, HOUR_IN_SECONDS );
+                }
+                return $support_reps;
+        }
 }

wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-plugin-directory-compat.php

@@ -78 +78 @@
                         $this->plugin       = $plugin;
                         $this->authors      = $this->get_authors( $slug );
                         $this->contributors = $this->get_contributors( $slug );
+                        $this->support_reps = $this->get_support_reps( $slug );
                 }
         }
 

wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-stickies-compat.php

@@ -12 +12 @@
         var $object   = null;
         var $term     = null;
 
-        public function __construct( $compat, $slug, $taxonomy, $object, $term, $authors = array(), $contributors = array() ) {
+        public function __construct( $compat, $slug, $taxonomy, $object, $term, $authors = array(), $contributors = array(), $support_reps = array() ) {
                 if ( empty( $compat ) || empty( $slug ) || empty( $taxonomy ) || empty( $object ) || empty( $term ) ) {
                         return;
                 }
@@ -24 +24 @@
                 $this->term         = $term;
                 $this->authors      = $authors;
                 $this->contributors = $contributors;
+                $this->support_reps = $support_reps;
 
                 // Remove global stickies from sticky array.
                 add_filter( 'bbp_get_super_stickies', array( $this, 'get_super_stickies' ) );
@@ -247 +248 @@
                         if ( $this->contributors && in_array( $user->user_nicename, $this->contributors ) ) {
                                 $retval = true;
                         }
+
+                        // Compat support reps.
+                        if ( $this->support_reps && in_array( $user->user_nicename, $this->support_reps ) ) {
+                                $retval = true;
+                        }
                 }
                 return $retval;
         }

wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-theme-directory-compat.php

@@ -78 +78 @@
                         $this->theme        = $theme;
                         $this->authors      = $this->get_authors( $slug );
                         $this->contributors = $this->get_contributors( $slug );
+                        $this->support_reps = $this->get_support_reps( $slug );
                 }
         }
 

wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-badges/inc/class-plugin.php

@@ -198 +198 @@
                                 $contrib_type = 'author';
                         } elseif ( $this->is_user_contributor( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
                                 $contrib_type = 'contributor';
+                        } elseif ( $this->is_user_support_rep( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
+                                $contrib_type = 'support-rep';
                         } else {
                                 $contrib_type = '';
                         }
@@ -312 +314 @@
                                 $help  = __( 'This person is a contributor to this theme', 'wporg-forums' );
                         }
                 }
+                elseif ( $this->is_user_support_rep( $info['user_nicename'], $info['type'], $info['slug'] ) ) {
+                        if ( 'plugin' == $info['type'] ) {
+                                $label = __( 'Plugin Support', 'wporg-forums' );
+                                $help  = __( 'This person is a support representative for this plugin', 'wporg-forums' );
+                        } else {
+                                $label = __( 'Theme Support', 'wporg-forums' );
+                                $help  = __( 'This person is a support representative for this theme', 'wporg-forums' );
+                        }
+                }
 
                 return $label ? array( 'type' => $info['type'], 'label' => $label, 'help' => $help ) : false;
         }
@@ -390 +401 @@
         }
 
         /**
+         * Checks if the specified user is a support rep for the specified plugin/theme.
+         *
+         * A support representative is someone assigned as such by the plugin or theme author.
+         *
+         * @param string $user_nicename User slug.
+         * @param string $type          Either 'plugin' or 'theme'.
+         * @param string $slug          Slug for the plugin or theme.
+         * @return bool                 True if user is a support rep, false otherwise.
+         */
+        public function is_user_support_rep( $user_nicename, $type, $slug ) {
+                if ( class_exists( '\WordPressdotorg\Forums\Plugin' ) ) {
+                        if ( 'plugin' === $type ) {
+                                $compat = \WordPressdotorg\Forums\Plugin::get_instance()->plugins;
+                        } else {
+                                $compat = \WordPressdotorg\Forums\Plugin::get_instance()->themes;
+                        }
+                } else {
+                        $compat = null;
+                }
+
+                $support_reps = $compat ? $compat->get_support_reps( $slug ) : array();
+
+                return $support_reps && in_array( $user_nicename, $support_reps );
+        }
+
+        /**
          * Checks if the specified user is a forum moderator or keymaster.
          *
          * By default, this considers a keymaster as being a moderator for the purpose

wordpress.org/public_html/wp-content/themes/pub/wporg-support/sass/elements/_badges.scss

@@ -6 +6 @@
         box-shadow: -4px 0 0 white, -6px 0 0 $color__moderator;
 }
 .by-plugin-author,
-.by-plugin-contributor {
+.by-plugin-contributor,
+.by-plugin-support-rep {
         box-shadow: -4px 0 0 white, -6px 0 0 $color__plugin-author;
 }
 
 .by-theme-author,
-.by-theme-contributor {
+.by-theme-contributor,
+.by-theme-support-rep {
         box-shadow: -4px 0 0 white, -6px 0 0 $color__theme-author;
 }