Changeset 4311

Timestamp:

10/31/2016 02:47:42 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: Pull reviews from bbPress2 rather than the old bbPress1 support forums.

See #1579

Location:

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

Files:

• api/routes/class-plugin.php (modified) (8 diffs)
• class-tools.php (modified) (1 diff)

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

@@ -3 +3 @@
 use WordPressdotorg\Plugin_Directory\Plugin_Directory;
 use WordPressdotorg\Plugin_Directory\Template;
+
 use WordPressdotorg\Plugin_Directory\API\Base;
 use WP_REST_Server;
@@ -105 +106 @@
         $_pages = preg_split( "#<!--section=(.+?)-->#", $post->post_content, - 1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
         for ( $i = 0; $i < count( $_pages ); $i += 2 ) {
-            $result['sections'][ $_pages[ $i ] ] = apply_filters( 'the_content', $_pages[ $i + 1 ] );
+            $result['sections'][ $_pages[ $i ] ] = apply_filters( 'the_content', $_pages[ $i + 1 ] );
         }
         $result['sections']['reviews'] = $this->get_plugin_reviews_markup( $post->post_name );
@@ -204 +205 @@
      * Returns a HTML formatted representation of the latest 10 reviews for a plugin.
      *
+
+
      * @param string $plugin_slug The plugin slug.
      * @return string HTML blob of data.
@@ -209 +212 @@
     protected function get_plugin_reviews_markup( $plugin_slug ) {
         $output = '';
-        foreach ( $this->get_plugin_reviews_data( $plugin_slug ) as $review ) {
+        foreach (  ) as $review ) {
             $output .= $this->get_plugin_reviews_markup_singular( $review );
         }
@@ -218 +221 @@
      * Generates a HTML blob for a single review.
      *
-     * @param object $review Single row of data from `self::get_plugin_reviews_data()`
+     * @param object $review 
      * @return string Blob of HTML representing the review.
      */
     protected function get_plugin_reviews_markup_singular( $review ) {
-        $reviewer = get_user_by( 'id', $review->topic_poster );
+        $reviewer = get_user_by( 'id', $review->r );
         ob_start();
-
-        // Copied from bb-theme/wporg/_reviews.php, with quite a few things stripped out.
 ?>
 <div class="review">
@@ -231 +232 @@
         <div class="reviewer-info">
             <div class="review-title-section">
-                <h4 class="review-title"><?php echo $review->topic_title; ?></h4>
+                <h4 class="review-title"><?php echo ; ?></h4>
                 <div class="star-rating"><?php
                     /* Core has .star-rating .star colour styling, which is why we use a custom wrapper and template */
                     echo Template::dashicons_stars( array(
-                        'rating' => wporg_get_rating( $review->topic_id ),
+                        'rating' => ,
                         'template' => '<span class="star %1$s"></span>',
                     ) );
@@ -241 +242 @@
             </div>
             <p class="reviewer">
-                By <a href="https://profiles.wordpress.org/<?php echo $reviewer->user_nicename; ?>"><?php echo get_avatar( $review->topic_poster, 16, 'monsterid' ); ?></a>
-                <a href="https://profiles.wordpress.org/<?php echo $reviewer->user_nicename; ?>" class="reviewer-name"><?php
-                    echo $reviewer->display_name;
-
+                <?php
+                    $review_author_markup_profile = esc_url( 'https://profiles.wordpress.org/' . $reviewer->user_nicename );
+                    $review_author_markup  = '<a href="' . $review_author_markup_profile . '">';
+                    $review_author_markup .= get_avatar( $reviewer->ID, 16, 'monsterid' ) . '</a>';
+                    $review_author_markup .= '<a href="' . $review_author_markup_profile . '" class="reviewer-name">';
+                    $review_author_markup .= $reviewer->display_name;
                     if ( $reviewer->display_name != $reviewer->user_login ) {
-                        echo " <small>({$reviewer->user_login})</small>";
+                         " <small>({$reviewer->user_login})</small>";
                     }
-                ?></a><?php
-                    /* // Display author badge next to the person's name if they're reviewing their own thing
-                    if ( class_exists( '\WPORG_Extend_Author_Badge' ) ) {
-                        echo \WPORG_Extend_Author_Badge::get_instance()->show_author_badge( '', $post->post_id );
-                    } */
-                ?>,
-                <span class="review-date"><?php echo gmdate( 'F j, Y', strtotime( $review->topic_start_time ) ); ?></span>
-                <?php if ( $review->wp_version ) : ?>
-                    <span class="review-wp-version">for WordPress <?php echo $review->wp_version; ?></span>
-                <?php endif; ?>
+                    $review_author_markup .= '</a>';
+
+                    printf( __( 'By %1$s on %2$s', 'wporg-plugins' ),
+                        $review_author_markup,
+                        '<span class="review-date">' . gmdate( 'F j, Y', strtotime( $review->post_modified ) ) . '</span>'
+                    );
+                ?>
             </p>
         </div>
     </div>
-    <div class="review-body"><?php echo $review->post_text; ?></div>
+    <div class="review-body"><?php echo $review->post_t; ?></div>
 </div>
 <?php
@@ -268 +268 @@
     }
 
-    /**
-     * Fetch the latest 10 reviews for a given plugin from the database.
-     *
-     * This uses raw SQL to query the bbPress tables to fetch reviews.
-     *
-     * @param string $plugin_slug The slug of the plugin.
-     * @return array An array of review details.
-     */
-    protected function get_plugin_reviews_data( $plugin_slug ) {
-        global $wpdb;
-        if ( ! defined( 'WPORGPATH' ) || ! defined( 'CUSTOM_USER_TABLE' ) ) {
-            // Reviews are stored in the main supoport forum, which isn't open source yet.
-            return array();
-        }
-
-        if ( $reviews = wp_cache_get( $plugin_slug, 'reviews' ) ) {
-            return $reviews;
-        }
-
-        // The forums are the source for users, and also where reviews live.
-        $table_prefix = str_replace( 'users', '', CUSTOM_USER_TABLE );
-        $forum_id = 18; // The Review Forums ID
-
-        $reviews = $wpdb->get_results( $wpdb->prepare( "
-            SELECT
-                t.topic_id, t.topic_title, t.topic_poster, t.topic_start_time,
-                p.post_text,
-                tm_wp.meta_value as wp_version
-            FROM {$table_prefix}topics AS t
-            JOIN {$table_prefix}meta AS tm ON ( tm.object_type = 'bb_topic' AND t.topic_id = tm.object_id AND tm.meta_key = 'is_plugin' )
-            JOIN {$table_prefix}posts as p ON ( t.topic_id = p.topic_id AND post_status = 0 AND post_position = 1 )
-            LEFT JOIN {$table_prefix}meta AS tm_wp ON ( tm_wp.object_type = 'bb_topic' AND t.topic_id = tm_wp.object_id AND tm_wp.meta_key = 'wp_version' )
-            WHERE t.forum_id = %d AND t.topic_status = 0 AND t.topic_sticky = 0 AND tm.meta_value = %s
-            ORDER BY t.topic_start_time DESC
-            LIMIT 10",
-            $forum_id,
-            $plugin_slug
-        ) );
-
-        wp_cache_set( $plugin_slug, $reviews, 'reviews' );
-        return $reviews;
-    }
 }
 

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

@@ -45 +45 @@
      * @return array|false
      */
-    public static function get_plugin_reviews( $plugin_slug ) {
-        if ( false === ( $reviews = wp_cache_get( "{$plugin_slug}_reviews", 'wporg-plugins' ) ) ) {
+    public static function get_plugin_reviews( $plugin_slug, $number = 2 ) {
+        $number = absint( $number );
+        if ( $number < 1 || $number > 100 ) {
+            $number = 2;
+        }
+        if ( false === ( $reviews = wp_cache_get( "{$plugin_slug}_last{$number}_reviews", 'wporg-plugins' ) ) ) {
             global $wpdb;
 
-            $reviews = $wpdb->get_results( $wpdb->prepare( "
-            SELECT posts.post_text AS post_content, topics.topic_title AS post_title, ratings.rating AS post_rating, ratings.user_id AS post_author
-            FROM ratings
-                INNER JOIN minibb_topics AS topics ON ( ratings.review_id = topics.topic_id )
-                INNER JOIN minibb_posts AS posts ON ( ratings.review_id = posts.topic_id )
-            WHERE
-                ratings.object_type = 'plugin' AND
-                ratings.object_slug = %s AND
-                posts.post_position = 1 AND
-                topics.topic_status = 0 AND
-                topics.topic_sticky = 0
-            ORDER BY ratings.review_id DESC LIMIT 2", $plugin_slug ) );
-
-            wp_cache_set( "{$plugin_slug}_reviews", $reviews, 'wporg-plugins', HOUR_IN_SECONDS );
+            $reviews = $wpdb->get_results( $wpdb->prepare(
+            "SELECT
+                    post_content, post_title, post_author, post_modified,
+                    r.rating as post_rating
+            FROM ratings r
+                LEFT JOIN wporg_419_posts p ON r.post_id = p.ID
+            WHERE r.object_type = 'plugin' AND r.object_slug = %s AND p.post_status = 'publish'
+            ORDER BY r.review_id DESC
+            LIMIT %d", $plugin_slug, $number ) );
+
+            wp_cache_set( "{$plugin_slug}_last{$number}_reviews", $reviews, 'wporg-plugins', HOUR_IN_SECONDS );
         }