Changeset 50109

Timestamp:

01/31/2021 12:48:24 PM (4 years ago)

Author:

johnbillion

Message:

Comments: Introduce a method for commenters to opt-in to receiving an email notification when their moderated comment gets approved.

The opt-in form is shown after the comment is submitted and held for moderation.

Sorry this took five years.

Props jeffr0, swissspidy, mrahmadawais, wonderboymusic, jdgrimes, obenland, Monika, imath, garrett-eclipse, johnbillion

Fixes #33717

Location:

trunk

Files:

• src/wp-comments-post.php (modified) (1 diff)
• src/wp-includes/class-walker-comment.php (modified) (7 diffs)
• src/wp-includes/comment.php (modified) (1 diff)
• src/wp-includes/default-filters.php (modified) (1 diff)
• tests/phpunit/tests/comment.php (modified) (1 diff)

trunk/src/wp-comments-post.php

@@ -23 +23 @@
 nocache_headers();
 
-$comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
-if ( is_wp_error( $comment ) ) {
-    $data = (int) $comment->get_error_data();
-    if ( ! empty( $data ) ) {
+if ( isset( $_POST['wp-comment-approved-notification-optin'], $_POST['comment_ID'], $_POST['moderation-hash'] ) ) {
+    $comment = get_comment( $_POST['comment_ID'] );
+
+    if ( $comment && hash_equals( $_POST['moderation-hash'], wp_hash( $comment->comment_date_gmt ) ) ) {
+        update_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true );
+    } else {
         wp_die(
-            '<p>' . $comment->get_error_message() . '</p>',
-            __( 'Comment Submission Failure' ),
+            '<p>' . ) . '</p>',
+            __( 'Comment n Failure' ),
             array(
-                'response'  => $data,
+                'response'  => ,
                 'back_link' => true,
             )
         );
-    } else {
-        exit;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
-
-$user            = wp_get_current_user();
-$cookies_consent = ( isset( $_POST['wp-comment-cookies-consent'] ) );
-
-/**
- * Perform other actions when comment cookies are set.
- *
- * @since 3.4.0
- * @since 4.9.6 The `$cookies_consent` parameter was added.
- *
- * @param WP_Comment $comment         Comment object.
- * @param WP_User    $user            Comment author's user object. The user may not exist.
- * @param bool       $cookies_consent Comment author's consent to store cookies.
- */
-do_action( 'set_comment_cookies', $comment, $user, $cookies_consent );
 
 $location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID;

trunk/src/wp-includes/class-walker-comment.php

@@ -40 +40 @@
         'id'     => 'comment_ID',
     );
+
+
+
+
+
+
+
+
+
+
 
     /**
@@ -256 +266 @@
      * Filters the comment text.
      *
-     * Removes links from the pending comment's text if the commenter did not consent
-     * to the comment cookies.
+     *   - Removes links from the pending comment's text if the commenter did not consent
+     *     to the comment cookies
+     *   - Prepends the approval notification opt-in form or message to pending comments
      *
      * @since 5.4.2
+
+
      *
      * @param string          $comment_text Text of the current comment.
@@ -273 +286 @@
         }
 
+
+
+
+
+
+
+
+
+
         return $comment_text;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -298 +392 @@
         $commenter          = wp_get_current_commenter();
         $show_pending_links = isset( $commenter['comment_author'] ) && $commenter['comment_author'];
-
-        if ( $commenter['comment_author_email'] ) {
-            $moderation_note = __( 'Your comment is awaiting moderation.' );
-        } else {
-            $moderation_note = __( 'Your comment is awaiting moderation. This is a preview; your comment will be visible after it has been approved.' );
-        }
         ?>
         <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>">
@@ -329 +417 @@
             ?>
         </div>
-        <?php if ( '0' == $comment->comment_approved ) : ?>
-        <em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
-        <br />
-        <?php endif; ?>
+
+        <?php
+        // Output the comment moderation feedback if needed.
+        $this->awaiting_moderation_text( $comment );
+
+        // Output the comment approval notification opt-in form if needed.
+        echo $this->comment_approval_notification_form( $comment );
+        ?>
 
         <div class="comment-meta commentmetadata">
@@ -402 +494 @@
         $commenter          = wp_get_current_commenter();
         $show_pending_links = ! empty( $commenter['comment_author'] );
-
-        if ( $commenter['comment_author_email'] ) {
-            $moderation_note = __( 'Your comment is awaiting moderation.' );
-        } else {
-            $moderation_note = __( 'Your comment is awaiting moderation. This is a preview; your comment will be visible after it has been approved.' );
-        }
         ?>
         <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?>>
@@ -451 +537 @@
                     </div><!-- .comment-metadata -->
 
-                    <?php if ( '0' == $comment->comment_approved ) : ?>
-                    <em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
-                    <?php endif; ?>
+                    <?php
+                    // Output the comment moderation feedback if needed.
+                    $this->awaiting_moderation_text( $comment );
+
+                    // Output the comment approval notification opt-in form if needed.
+                    echo $this->comment_approval_notification_form( $comment );
+                    ?>
                 </footer><!-- .comment-meta -->
 

trunk/src/wp-includes/comment.php

@@ -2350 +2350 @@
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  * Sets the status of a comment.
  *

trunk/src/wp-includes/default-filters.php

@@ -469 +469 @@
 add_action( 'register_new_user', 'wp_send_new_user_notifications' );
 add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 );
+
 
 // REST API actions.

trunk/tests/phpunit/tests/comment.php

@@ -553 +553 @@
         self::$notify_message = $notify_message;
         return $notify_message;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }