Changeset 1463

Timestamp:

03/30/2015 04:37:50 AM (10 years ago)

Author:

dd32

Message:

Themes Directory: Switch the Themes Directory to calling api.wordpress.org directly instead of running it through admin-ajax.php

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/theme-directory/theme-directory.php (modified) (2 diffs)
• themes/pub/wporg-themes/js/theme.js (modified) (3 diffs)

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

@@ -616 +616 @@
     $api = new Themes_API( 'get_result' );
     $api->fields = array_merge( $api->fields, array(
-        'description'  => true,
-        'sections'     => false,
-        'tested'       => true,
-        'requires'     => true,
-        'rating'       => true,
-        'ratings'      => true,
-        'downloaded'   => true,
-        'downloadlink' => true,
-        'last_updated' => true,
-        'homepage'     => true,
-        'tags'         => true,
-        'num_ratings'  => true,
-        'parent'       => true,
-        'theme_url'    => true,
+        'description'        => true,
+        'sections'           => false,
+        'tested'             => true,
+        'requires'           => true,
+        'rating'             => true,
+        'ratings'            => true,
+        'downloaded'         => true,
+        'downloadlink'       => true,
+        'last_updated'       => true,
+        'homepage'           => true,
+        'tags'               => true,
+        'num_ratings'        => true,
+        'parent'             => true,
+        'theme_url'          => true,
+        'extended_author'    => true,
+        'photon_screenshots' => true,
     ) );
 
     $themes = array_map( array( $api, 'fill_theme' ), $wp_query->posts );
-    $themes = array_map( 'wporg_themes_ajax_prepare_theme', $themes );
 
     $request = array();
@@ -657 +658 @@
     );
  }
-
-
-/**
- * Removes Core's built-in query-themes handler, so we can safely add ours later on.
- */
-function wporg_themes_remove_ajax_action() {
-    remove_action( 'wp_ajax_query-themes', 'wp_ajax_query_themes', 1 );
-}
-add_action( 'wp_ajax_query-themes', 'wporg_themes_remove_ajax_action', -1 );
-
-/**
- * A recreation of Core's implementation without capability check, since there is nothing to install.
- */
-function wporg_themes_query_themes() {
-    $request = wp_unslash( $_REQUEST['request'] );
-    $request['fields'] = wp_parse_args( $request['fields'], array(
-        'description'  => true,
-        'sections'     => false,
-        'tested'       => true,
-        'requires'     => true,
-        'rating'       => true,
-        'ratings'      => true,
-        'downloaded'   => true,
-        'downloadlink' => true,
-        'last_updated' => true,
-        'homepage'     => true,
-        'tags'         => true,
-        'num_ratings'  => true,
-        'parent'       => true,
-        'theme_url'    => true,
-    ) );
-    $args = wp_parse_args( array(
-        'per_page' => 15,
-    ), $request);
-
-    include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
-    $api = new Themes_API( 'query_themes', $args );
-    $api = $api->response;
-
-    if ( is_wp_error( $api ) ) {
-        wp_send_json_error();
-    }
-
-    foreach ( $api->themes as $key => $theme ) {
-        $api->themes[ $key ] = wporg_themes_ajax_prepare_theme( $theme );
-    }
-
-    wp_send_json_success( $api );
-}
-add_action( 'wp_ajax_query-themes',        'wporg_themes_query_themes' );
-add_action( 'wp_ajax_nopriv_query-themes', 'wporg_themes_query_themes' );
-
-function wporg_themes_theme_info() {
-    $request = wp_unslash( $_REQUEST['request'] );
-    $request['fields'] = wp_parse_args( $request['fields'], array(
-        'description'  => true,
-        'sections'     => false,
-        'tested'       => true,
-        'requires'     => true,
-        'rating'       => true,
-        'ratings'      => true,
-        'downloaded'   => true,
-        'downloadlink' => true,
-        'last_updated' => true,
-        'homepage'     => true,
-        'tags'         => true,
-        'num_ratings'  => true,
-        'parent'       => true,
-        'theme_url'    => true,
-    ) );
-
-    include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
-    $api = new Themes_API( 'theme_information', $request );
-    $api = $api->response;
-
-    if ( empty( $api ) ) {
-        wp_send_json_error();
-    }
-
-    $api = wporg_themes_ajax_prepare_theme( $api );
-
-    wp_send_json_success( $api );
-}
-add_action( 'wp_ajax_theme-info',        'wporg_themes_theme_info' );
-add_action( 'wp_ajax_nopriv_theme-info', 'wporg_themes_theme_info' );
-
-function wporg_themes_ajax_prepare_theme( $theme ) {
-    global $themes_allowedtags;
-    if ( empty( $themes_allowedtags ) ) {
-        $themes_allowedtags = array(
-            'a'       => array( 'href' => array(), 'title' => array(), 'target' => array() ),
-            'abbr'    => array( 'title' => array() ),
-            'acronym' => array( 'title' => array() ),
-            'code'    => array(),
-            'pre'     => array(),
-            'em'      => array(),
-            'strong'  => array(),
-            'div'     => array(),
-            'p'       => array(),
-            'ul'      => array(),
-            'ol'      => array(),
-            'li'      => array(),
-            'h1'      => array(),
-            'h2'      => array(),
-            'h3'      => array(),
-            'h4'      => array(),
-            'h5'      => array(),
-            'h6'      => array(),
-            'img'     => array( 'src' => array(), 'class' => array(), 'alt' => array() ),
-        );
-    }
-
-    $author        = get_user_by( 'slug', $theme->author );
-    $theme->author = new StdClass;
-    foreach ( array( 'user_nicename', 'display_name' ) as $property ) {
-        $theme->author->$property = get_the_author_meta( $property, $author->ID );
-    }
-
-    $theme->name        = wp_kses( $theme->name, $themes_allowedtags );
-    $theme->version     = wp_kses( $theme->version, $themes_allowedtags );
-    $theme->description = wp_kses( $theme->description, $themes_allowedtags );
-    $theme->downloaded  = number_format_i18n( $theme->downloaded );
-    $theme->rating_text = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $theme->num_ratings ), number_format_i18n( $theme->num_ratings ) );
-    $theme->num_ratings = number_format_i18n( $theme->num_ratings );
-    $theme->preview_url = set_url_scheme( $theme->preview_url );
-
-    if ( preg_match( '/screenshot.(jpg|jpeg|png|gif)/', $theme->screenshot_url, $match ) ) {
-        $theme->screenshot_url = sprintf( 'https://i0.wp.com/themes.svn.wordpress.org/%1$s/%2$s/%3$s',
-            $theme->slug,
-            $theme->version,
-            $match[0]
-        );
-    }
-
-    return $theme;
-}

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js

@@ -320 +320 @@
         // Send request to api.wordpress.org/themes
         apiCall: function( request, paginated ) {
-            return wp.ajax.send( 'query-themes', {
+
+            var options = {
+                type: 'POST',
+                url: 'https://api.wordpress.org/themes/info/1.1/',
                 data: {
+                    action: 'query_themes',
                     // Request data
                     request: _.extend({
@@ -327 +331 @@
                         fields: {
                             description: true,
+                            sections: false,
                             tested: true,
                             requires: true,
-                            rating: true,
                             downloaded: true,
                             downloadLink: true,
                             last_updated: true,
                             homepage: true,
-                            num_ratings: true
+                            theme_url: true,
+                            parent: true,
+                            tags: true,
+                            rating: true,
+                            ratings: true,
+                            num_ratings: true,
+                            extended_author: true,
+                            photon_screenshots: true
                         }
                     }, request)
@@ -345 +356 @@
                     }
                 }
-            });
+            };
+
+            return $.Deferred( function( deferred ) {
+                $.ajax( options ).done( function( response ) {
+                    deferred['resolveWith']( this, [ response ] );
+                }).fail( function() {
+                    deferred.rejectWith( this, arguments );
+                });
+            }).promise();
+
         }
     });