Changeset 3753

Timestamp:

07/29/2016 11:29:18 PM (9 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Prevent user from voting on their own user contributed note.

Props keesiemeijer.
See #1755.

Location:

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

Files:

• inc/template-tags.php (modified) (1 diff)
• inc/user-content-voting.php (modified) (3 diffs)
• scss/main.scss (modified) (1 diff)
• stylesheets/main.css (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php

@@ -132 +132 @@
             $GLOBALS['comment'] = $comment;
             $count = (int) DevHub_User_Contributed_Notes_Voting::count_votes( $comment->comment_ID, 'difference' );
-            $comment_class = ( -1 > $count ) ? 'bad-note' : '';
+            $curr_user_note = DevHub_User_Contributed_Notes_Voting::is_current_user_note( $comment->comment_ID );
+
+            $comment_class = array();
+            if ( -1 > $count ) {
+                $comment_class[] = 'bad-note';
+            }
+            if ( $curr_user_note ) {
+                $comment_class[] = 'user-submitted-note';
+            }
             ?>
 
-            <li id="comment-<?php comment_ID(); ?>" <?php comment_class( $comment_class ); ?>>
+            <li id="comment-<?php comment_ID(); ?>" <?php comment_class( implode( ' ', $comment_class ) ); ?>>
             <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
                 <a href="#comment-content-<?php echo $comment->comment_ID; ?>" class="screen-reader-text"><?php _e( 'Skip to note content', 'wporg' ); ?></a> 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-voting.php

@@ -195 +195 @@
         if ( $comment_id ) {
             $can = ( '1' == get_comment( $comment_id )->comment_approved );
+            // Users can't vote on their own comments.
+            if ( $can && self::is_current_user_note( $comment_id ) ) {
+                $can = false;
+            }
         }
 
         return apply_filters( 'devhub_user_can_vote', $can, $user_id, $comment_id );
+    }
+
+    /**
+     * Determines if a note was submitted by the current user.
+     *
+     * @param int   $comment_id The comment ID, or empty to use current comment.
+     * @return bool True if the note was submitted by the current user.
+     */
+    public static function is_current_user_note( $comment_id = '' ) {
+        if ( ! $comment_id ) {
+            global $comment;
+            $comment_id = $comment->comment_ID;
+        }
+
+        $note    = get_comment( $comment_id );
+        $user_id = get_current_user_id();
+
+        if ( ! $note || ! $user_id ) {
+            return false;
+        }
+
+        if ( (int) $note->user_id === $user_id ) {
+            return true;
+        }
+
+        return false;
     }
 
@@ -264 +294 @@
 
         $can_vote     = self::user_can_vote( get_current_user_id(), $comment_id );
+        $user_note    = self::is_current_user_note( $comment_id );
         $logged_in    = is_user_logged_in();
         $comment_link = get_comment_link( $comment_id );
@@ -270 +301 @@
         $log_in_str   = __( 'You must log in to vote on the helpfulness of this note', 'wporg' );
         $log_in_url   = add_query_arg( 'redirect_to', urlencode( $comment_link ), 'https://login.wordpress.org' );
+
+        if ( ! $can_vote && $user_note ) {
+            $disabled_str = __( 'Voting for your own note is disabled', 'wporg' );
+        }
 
         echo '<div class="user-note-voting" data-nonce="' . esc_attr( $nonce ) . '">';

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss

@@ -1483 +1483 @@
         color: red;
     }
+    .user-submitted-note .dashicons {
+        color: grey;
+    }
 
     .syntaxhighlighter {

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css

@@ -1818 +1818 @@
 }
 
+.devhub-wrap .user-submitted-note .dashicons {
+  color: grey;
+}
+
 .devhub-wrap .syntaxhighlighter {
   /* These are !important due to use of !important in SyntaxHighlighter Evolved plugin. */