Changeset 61179

Timestamp:

11/07/2025 02:05:43 PM (3 months ago)

Author:

ellatrix

Message:

Notes: notify post author on note submission.

Fix an issue where new notes did not trigger a notification because they are submitted via the REST API. Ensures REST API submissions (for notes) trigger the post author notification. Leverage existing comment notification infrastructure.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10472.

Fixes #64204.
Props adamsilverstein, mamaduka, peterwilsoncc, ellatrix, wildworks, mukesh27, desrosj, annezazu, jeffpaul.

Location:

trunk/src

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/options-discussion.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-includes/comment.php (modified) (2 diffs)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (2 diffs)
• wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php (modified) (1 diff)

trunk/src/wp-admin/includes/schema.php

@@ -561 +561 @@
         // 6.4.0
         'wp_attachment_pages_enabled'     => 0,
+
+        // 6.9.0
+        'wp_notes_notify'                 => 1,
+
     );
 

trunk/src/wp-admin/options-discussion.php

@@ -161 +161 @@
 <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked( '1', get_option( 'moderation_notify' ) ); ?> />
 <?php _e( 'A comment is held for moderation' ); ?> </label>
+<br />
+<label for="wp_notes_notify">
+<input name="wp_notes_notify" type="checkbox" id="wp_notes_notify" value="1" <?php checked( '1', get_option( 'wp_notes_notify' ) ); ?> />
+<?php _e( 'Anyone posts a note' ); ?> </label>
+
 </fieldset></td>
 </tr>

trunk/src/wp-admin/options.php

@@ -126 +126 @@
         'comment_registration',
         'show_comments_cookies_opt_in',
+        'wp_notes_notify',
     ),
     'media'      => array(

trunk/src/wp-includes/comment.php

@@ -2426 +2426 @@
 function wp_new_comment_notify_postauthor( $comment_id ) {
     $comment = get_comment( $comment_id );
-
-    $maybe_notify = get_option( 'comments_notify' );
+    $is_note = ( $comment && 'note' === $comment->comment_type );
+
+    $maybe_notify = $is_note ? get_option( 'wp_notes_notify' ) : get_option( 'comments_notify' );
 
     /**
@@ -2448 +2449 @@
     }
 
-    // Only send notifications for approved comments.
-    if ( ! isset( $comment->comment_approved ) || '1' !== $comment->comment_approved ) {
-        return false;
+    // Send notifications for approved comments and all notes.
+    if (
+        ! isset( $comment->comment_approved ) ||
+        ( '1' !== $comment->comment_approved && ! $is_note ) ) {
+            return false;
     }
 

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

@@ -523 +523 @@
 add_action( 'comment_post', 'wp_new_comment_notify_moderator' );
 add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
+add_action( 'rest_insert_comment', array( 'WP_REST_Comments_Controller', 'wp_new_comment_via_rest_notify_postauthor' ) );
 add_action( 'after_password_reset', 'wp_password_change_notification' );
 add_action( 'register_new_user', 'wp_send_new_user_notifications' );

trunk/src/wp-includes/pluggable.php

@@ -1895 +1895 @@
                     break;
 
+                case 'note':
+                    /* translators: %s: Post title. */
+                    $notify_message = sprintf( __( 'New note on your post "%s"' ), $post->post_title ) . "\r\n";
+                    /* translators: 1: Note author's name, 2: Note author's IP address, 3: Note author's hostname. */
+                    $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+                    /* translators: %s: Note author email. */
+                    $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
+                    /* translators: %s: Note text. */
+                    $notify_message .= sprintf( __( 'Note: %s' ), "\r\n" . ( empty( $comment_content ) ? __( 'resolved/reopened' ) : $comment_content ) ) . "\r\n\r\n";
+                    $notify_message .= __( 'You can see all notes on this post here:' ) . "\r\n";
+                    /* translators: Note notification email subject. 1: Site title, 2: Post title. */
+                    $subject = sprintf( __( '[%1$s] Note: "%2$s"' ), $blogname, $post->post_title );
+                    break;
+
                 default: // Comments.
                     /* translators: %s: Post title. */
@@ -1918 +1932 @@
             }
 
-            $notify_message .= get_permalink( $comment->comment_post_ID ) . "#comments\r\n\r\n";
             /* translators: %s: Comment URL. */
-            $notify_message .= sprintf( __( 'Permalink: %s' ), get_comment_link( $comment ) ) . "\r\n";
-
-            if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
+            if ( 'note' === $comment->comment_type ) {
+                $notify_message .= get_edit_post_link( $comment->comment_post_ID, 'url' ) . "\r\n";
+            } else {
+                $notify_message .= get_permalink( $comment->comment_post_ID ) . "#comments\r\n\r\n";
+                $notify_message .= sprintf( __( 'Permalink: %s' ), get_comment_link( $comment ) ) . "\r\n";
+            }
+
+            if ( 'note' !== $comment->comment_type && user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
                 if ( EMPTY_TRASH_DAYS ) {
                     /* translators: Comment moderation. %s: Comment action URL. */

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

@@ -37 +37 @@
     }
 
+    /**
+     * Send a notification to the post author when a new note is added via the REST API.
+     *
+     * @since 6.9.0
+     *
+     * @param WP_Comment $comment The comment object.
+     */
+    public static function wp_new_comment_via_rest_notify_postauthor( $comment ) {
+        if ( 'note' === $comment->comment_type ) {
+            wp_new_comment_notify_postauthor( $comment->comment_ID );
+        }
+    }
     /**
      * Registers the routes for comments.