Ticket #38821: 38821.diff

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php

@@ -109 +109 @@
                                 $post = get_post( $post_id );
 
                                 if ( ! empty( $post_id ) && $post && ! $this->check_read_post_permission( $post ) ) {
                                         return new WP_Error( 'rest_cannot_read_post', __( 'Sorry, you are not allowed to read the post for this comment.' ), array( 'status' => rest_authorization_required_code() ) );
                                 } elseif ( 0 === $post_id && ! current_user_can( 'moderate_comments' ) ) {
                                         return new WP_Error( 'rest_cannot_read', __( 'Sorry, you are not allowed to read comments without a post.' ), array( 'status' => rest_authorization_required_code() ) );
                                 }
                         }
                 }
 
                 if ( ! empty( $request['context'] ) && 'edit' === $request['context'] && ! current_user_can( 'moderate_comments' ) ) {
                         return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to view comments with edit context.' ), array( 'status' => rest_authorization_required_code() ) );
                 }
 
                 if ( ! current_user_can( 'edit_posts' ) ) {
-                        $protected_params = array( 'author', 'author_exclude', 'karma', 'author_email', 'type', 'status' );
+                        $protected_params = array( 'author', 'author_exclude', 'author_email', 'type', 'status' );
                         $forbidden_params = array();
 
                         foreach ( $protected_params as $param ) {
                                 if ( 'status' === $param ) {
                                         if ( 'approve' !== $request[ $param ] ) {
                                                 $forbidden_params[] = $param;
                                         }
                                 } elseif ( 'type' === $param ) {
                                         if ( 'comment' !== $request[ $param ] ) {
                                                 $forbidden_params[] = $param;
                                         }
                                 } elseif ( ! empty( $request[ $param ] ) ) {
                                         $forbidden_params[] = $param;
                                 }
                         }
@@ -160 +160 @@
                 // Retrieve the list of registered collection query parameters.
                 $registered = $this->get_collection_params();
 
                 /*
                  * This array defines mappings between public API query parameters whose
                  * values are accepted as-passed, and their internal WP_Query parameter
                  * name equivalents (some are the same). Only values which are also
                  * present in $registered will be set.
                  */
                 $parameter_mappings = array(
                         'author'         => 'author__in',
                         'author_email'   => 'author_email',
                         'author_exclude' => 'author__not_in',
                         'exclude'        => 'comment__not_in',
                         'include'        => 'comment__in',
-                        'karma'          => 'karma',
                         'offset'         => 'offset',
                         'order'          => 'order',
                         'parent'         => 'parent__in',
                         'parent_exclude' => 'parent__not_in',
                         'per_page'       => 'number',
                         'post'           => 'post__in',
                         'search'         => 'search',
                         'status'         => 'status',
                         'type'           => 'type',
                 );
 
                 $prepared_args = array();
 
                 /*
                  * For each known parameter which is both registered and present in the request,
                  * set the parameter's value on the query $prepared_args.
                  */
                 foreach ( $parameter_mappings as $api_param => $wp_param ) {
                         if ( isset( $registered[ $api_param ], $request[ $api_param ] ) ) {
                                 $prepared_args[ $wp_param ] = $request[ $api_param ];
                         }
                 }
 
                 // Ensure certain parameter values default to empty strings.
-                foreach ( array( 'author_email', 'karma', 'search' ) as $param ) {
+                foreach ( array( 'author_email', 'search' ) as $param ) {
                         if ( ! isset( $prepared_args[ $param ] ) ) {
                                 $prepared_args[ $param ] = '';
                         }
                 }
 
                 if ( isset( $registered['orderby'] ) ) {
                         $prepared_args['orderby'] = $this->normalize_query_param( $request['orderby'] );
                 }
 
                 $prepared_args['no_found_rows'] = false;
 
                 $prepared_args['date_query'] = array();
 
                 // Set before into date query. Date query must be specified as an array of an array.
                 if ( isset( $registered['before'], $request['before'] ) ) {
@@ -360 +359 @@
         /**
          * Checks if a given request has access to create a comment.
          *
          * @since 4.7.0
          * @access public
          *
          * @param WP_REST_Request $request Full details about the request.
          * @return WP_Error|bool True if the request has access to create items, error object otherwise.
          */
         public function create_item_permissions_check( $request ) {
 
                 if ( ! is_user_logged_in() && get_option( 'comment_registration' ) ) {
                         return new WP_Error( 'rest_comment_login_required', __( 'Sorry, you must be logged in to comment.' ), array( 'status' => 401 ) );
                 }
 
-                // Limit who can set comment `author`, `karma` or `status` to anything other than the default.
+                // Limit who can set comment `author` or `status` to anything other than the default.
                 if ( isset( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( 'moderate_comments' ) ) {
                         return new WP_Error( 'rest_comment_invalid_author', __( 'Comment author invalid.' ), array( 'status' => rest_authorization_required_code() ) );
                 }
 
-                if ( isset( $request['karma'] ) && $request['karma'] > 0 && ! current_user_can( 'moderate_comments' ) ) {
-                        return new WP_Error( 'rest_comment_invalid_karma', __( 'Sorry, you are not allowed to set karma for comments.' ), array( 'status' => rest_authorization_required_code() ) );
-                }
-
                 if ( isset( $request['status'] ) && ! current_user_can( 'moderate_comments' ) ) {
                         return new WP_Error( 'rest_comment_invalid_status', __( 'Sorry, you are not allowed to set status for comments.' ), array( 'status' => rest_authorization_required_code() ) );
                 }
 
                 if ( empty( $request['post'] ) && ! current_user_can( 'moderate_comments' ) ) {
                         return new WP_Error( 'rest_comment_invalid_post_id', __( 'Sorry, you are not allowed to create this comment without a post.' ), array( 'status' => rest_authorization_required_code() ) );
                 }
 
                 if ( ! empty( $request['post'] ) && $post = get_post( (int) $request['post'] ) ) {
                         if ( 'draft' === $post->post_status ) {
                                 return new WP_Error( 'rest_comment_draft_post', __( 'Sorry, you are not allowed to create a comment on this post.' ), array( 'status' => 403 ) );
                         }
 
                         if ( 'trash' === $post->post_status ) {
                                 return new WP_Error( 'rest_comment_trash_post', __( 'Sorry, you are not allowed to create a comment on this post.' ), array( 'status' => 403 ) );
@@ -797 +792 @@
                         'post'               => (int) $comment->comment_post_ID,
                         'parent'             => (int) $comment->comment_parent,
                         'author'             => (int) $comment->user_id,
                         'author_name'        => $comment->comment_author,
                         'author_email'       => $comment->comment_author_email,
                         'author_url'         => $comment->comment_author_url,
                         'author_ip'          => $comment->comment_author_IP,
                         'author_user_agent'  => $comment->comment_agent,
                         'date'               => mysql_to_rfc3339( $comment->comment_date ),
                         'date_gmt'           => mysql_to_rfc3339( $comment->comment_date_gmt ),
                         'content'            => array(
                                 /** This filter is documented in wp-includes/comment-template.php */
                                 'rendered' => apply_filters( 'comment_text', $comment->comment_content, $comment ),
                                 'raw'      => $comment->comment_content,
                         ),
-                        'karma'              => (int) $comment->comment_karma,
                         'link'               => get_comment_link( $comment ),
                         'status'             => $this->prepare_status_response( $comment->comment_approved ),
                         'type'               => get_comment_type( $comment->comment_ID ),
                 );
 
                 $schema = $this->get_item_schema();
 
                 if ( ! empty( $schema['properties']['author_avatar_urls'] ) ) {
                         $data['author_avatar_urls'] = rest_get_avatar_urls( $comment->comment_author_email );
                 }
 
                 if ( ! empty( $schema['properties']['meta'] ) ) {
                         $data['meta'] = $this->meta->get_value( $comment->comment_ID, $request );
                 }
 
@@ -1038 +1032 @@
                 }
 
                 if ( isset( $request['author_ip'] ) ) {
                         $prepared_comment['comment_author_IP'] = $request['author_ip'];
                 }
 
                 if ( isset( $request['author_user_agent'] ) ) {
                         $prepared_comment['comment_agent'] = $request['author_user_agent'];
                 }
 
                 if ( isset( $request['type'] ) ) {
                         // Comment type "comment" needs to be created as an empty string.
                         $prepared_comment['comment_type'] = 'comment' === $request['type'] ? '' : $request['type'];
                 }
 
-                if ( isset( $request['karma'] ) ) {
-                        $prepared_comment['comment_karma'] = $request['karma'] ;
-                }
-
                 if ( ! empty( $request['date'] ) ) {
                         $date_data = rest_get_date_with_gmt( $request['date'] );
 
                         if ( ! empty( $date_data ) ) {
                                 list( $prepared_comment['comment_date'], $prepared_comment['comment_date_gmt'] ) = $date_data;
                         }
                 } elseif ( ! empty( $request['date_gmt'] ) ) {
                         $date_data = rest_get_date_with_gmt( $request['date_gmt'], true );
 
                         if ( ! empty( $date_data ) ) {
                                 list( $prepared_comment['comment_date'], $prepared_comment['comment_date_gmt'] ) = $date_data;
                         }
                 }
 
                 /**
@@ -1162 +1152 @@
                                                 ),
                                         ),
                                 ),
                                 'date'             => array(
                                         'description'  => __( 'The date the object was published.' ),
                                         'type'         => 'string',
                                         'format'       => 'date-time',
                                         'context'      => array( 'view', 'edit', 'embed' ),
                                 ),
                                 'date_gmt'         => array(
                                         'description'  => __( 'The date the object was published as GMT.' ),
                                         'type'         => 'string',
                                         'format'       => 'date-time',
                                         'context'      => array( 'view', 'edit' ),
                                 ),
-                                'karma'             => array(
-                                        'description'  => __( 'Karma for the object.' ),
-                                        'type'         => 'integer',
-                                        'context'      => array( 'edit' ),
-                                ),
                                 'link'             => array(
                                         'description'  => __( 'URL to the object.' ),
                                         'type'         => 'string',
                                         'format'       => 'uri',
                                         'context'      => array( 'view', 'edit', 'embed' ),
                                         'readonly'     => true,
                                 ),
                                 'parent'           => array(
                                         'description'  => __( 'The id for the parent of the object.' ),
                                         'type'         => 'integer',
                                         'context'      => array( 'view', 'edit', 'embed' ),
                                         'default'      => 0,
                                 ),
                                 'post'             => array(
                                         'description'  => __( 'The id of the associated post object.' ),
@@ -1300 +1285 @@
                         'items'              => array(
                                 'type'           => 'integer',
                         ),
                         'default'            => array(),
                 );
 
                 $query_params['include'] = array(
                         'description'        => __( 'Limit result set to specific ids.' ),
                         'type'               => 'array',
                         'items'              => array(
                                 'type'           => 'integer',
                         ),
                         'default'            => array(),
                 );
 
-                $query_params['karma'] = array(
-                        'default'           => null,
-                        'description'       => __( 'Limit result set to that of a particular comment karma. Requires authorization.' ),
-                        'type'              => 'integer',
-                );
-
                 $query_params['offset'] = array(
                         'description'        => __( 'Offset the result set by a specific number of comments.' ),
                         'type'               => 'integer',
                 );
 
                 $query_params['order']      = array(
                         'description'           => __( 'Order sort attribute ascending or descending.' ),
                         'type'                  => 'string',
                         'default'               => 'desc',
                         'enum'                  => array(
                                 'asc',
                                 'desc',
                         ),
                 );