Incorporating foundation of "Notes" feature #10280

t-hamano · 2025-10-15T07:32:18Z

Related Gutenberg Issue: Graduate Block Level Commenting from Experiments gutenberg#71826
Related Gutenberg PR: Notes: Graduate from experiments gutenberg#72344

This PR updates the core codebase to allow the Notes feature to work properly.

Trac ticket: https://core.trac.wordpress.org/ticket/64096

Note

This PR also includes #9869. Don't forget to add the following prop when committing to core:

Props ristojovanovic, adamsilverstein, jeffpaul.

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

t-hamano · 2025-10-15T08:50:32Z

Ok, I believe backporting PHP should be all done. Next, I'll try to fix the failing tests.

src/wp-includes/post.php

Mamaduka · 2025-10-15T09:09:30Z

Ok, I believe backporting PHP should be all done. Next, I'll try to fix the failing tests.

I think we're missing the Notes-specific unit tests.

tests/phpunit/tests/rest-api/rest-comments-controller.php

Mamaduka · 2025-10-15T10:23:56Z

src/wp-admin/includes/comment.php

 	$post_id_in    = "'" . implode( "', '", $post_id_array ) . "'";

-	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
+	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' AND comment_type != 'note' GROUP BY comment_post_ID", ARRAY_A );


There's another PR for get_pending_comments_num changes - #9869.

Just noting for props.

Not a fan of hardcoding comment types. Long term we should think about using a filterable list of comment types to exclude or using (an improved) WP_Comment_Query

100%. I think a long-term solution is to provide proper support for custom comment types, so we can avoid hardcoded patches like we've introduced with the current implementation.

tests/qunit/fixtures/wp-api-generated.js

tests/phpunit/tests/rest-api/rest-comments-controller.php

TimothyBJacobs · 2025-10-15T16:13:17Z

src/wp-includes/comment.php

 	 */
 	$dupe_id = apply_filters( 'duplicate_comment_id', $dupe_id, $commentdata );

+	// Allow duplicate notes for resolution purposes.


I'm not sure this should happen after the apply_filters call. Seems like we'd want to let developers customize behavior here.

+1, I'd prefer we keep this filterable.

Fixed in a43a2b0

TimothyBJacobs · 2025-10-15T16:14:58Z

src/wp-includes/comment.php

+ *
+ * @since 6.9.0
+ */
+function wp_register_notes_metadata() {


I'd model this closer to wp_create_initial_post_meta, so wp_create_initial_comment_meta. Future additions would be added into that one function, instead of splitting each registration into it's own function.

Fixed in 48cb687

TimothyBJacobs · 2025-10-15T16:17:02Z

src/wp-includes/comment.php

+			'auth_callback' => function ( $allowed, $meta_key, $object_id ) {
+				return current_user_can( 'edit_comment', $object_id );
+			},


This is already the default behavior applied by map_meta_cap, I believe this is just resulting in a duplicate check,

Fixed in 278d274

TimothyBJacobs · 2025-10-15T16:19:39Z

Ditto all the feedback about wishing we had a fleshed out comment types API about now. But I think this looks pretty reasonable.

Co-authored-by: Timothy Jacobs <[email protected]>

t-hamano · 2025-10-16T01:31:27Z

src/wp-includes/comment.php

 		'count'                     => true,
 		'update_comment_meta_cache' => false,
 		'orderby'                   => 'none',
+		'type__not_in'              => array( 'note' ),


This is necessary to filter out Note-type comments from the dashboard. Otherwise, the dashboard shows unintended counts.

swissspidy · 2025-10-16T08:33:30Z

Curious, does this work well with WP-CLI out of the box when dealing with comments?

Mamaduka · 2025-10-17T08:01:15Z

Curious, does this work well with WP-CLI out of the box when dealing with comments?

Do you have any particular concerns, @swissspidy? I've only used WP-CLI to clean up test data or migrate notes after the type change. It worked perfectly.

@t-hamano, what are the remaining blockers here?

t-hamano · 2025-10-17T08:39:07Z

@t-hamano, what are the remaining blockers here?

I think I've addressed all the feedback.

src/wp-includes/comment.php

adamsilverstein

Great!

Left one small comment feedback

Co-authored-by: Adam Silverstein <[email protected]>

Mamaduka

It seems all the feedback has been addressed.

@t-hamano or @adamsilverstein, are you planning to handle the commit?

t-hamano · 2025-10-20T12:30:42Z

I haven't committed to core yet, so I'd be happy if someone could do that 😅 That said, I'd like to set up an SVN environment, understand the core committer workflow, and try my hand at committing within the 6.9 cycle.

t-hamano mentioned this pull request Oct 15, 2025

Notes: Graduate from experiments WordPress/gutenberg#72344

Merged

Update comment REST API

e08eea2

t-hamano force-pushed the 64096-notes-backport branch from 004f7fb to e08eea2 Compare October 15, 2025 07:35

t-hamano added 5 commits October 15, 2025 16:40

Add post type support

c00b9e1

Register metadata

c1aebc0

Update avatar comment type

495504c

Allow duplicate notes for resolution purposes

f5207cf

Exclude notes from admin comments query

954f534

Mamaduka reviewed Oct 15, 2025

View reviewed changes

src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php Outdated Show resolved Hide resolved

t-hamano changed the title ~~Notes: Update comments rest API~~ Incorporating foundation of "Notes" feature Oct 15, 2025

t-hamano added 4 commits October 15, 2025 17:12

Exclude note type comment from comment count query

7d1e549

Extend post_type_supports function to check sub-features

3e4347b

Remove unnecessary check

7276884

Change how sub-features are checked

f74effd

Fix WP_Test_REST_Comments_Controller Unit test

13defce

Mamaduka reviewed Oct 15, 2025

View reviewed changes

src/wp-includes/post.php Outdated Show resolved Hide resolved

t-hamano commented Oct 15, 2025

View reviewed changes

tests/phpunit/tests/rest-api/rest-comments-controller.php Outdated Show resolved Hide resolved

Revert changes to the post_type_supports function

3cf787a

Mamaduka reviewed Oct 15, 2025

View reviewed changes

Add unit test for notes

b351ddb

t-hamano force-pushed the 64096-notes-backport branch from 48d0ba7 to b351ddb Compare October 15, 2025 11:15

t-hamano added 2 commits October 15, 2025 20:19

Minor refactoring and fix lint error

ce0f128

Regenerate API fixtures

df8cb5d

t-hamano commented Oct 15, 2025

View reviewed changes

tests/qunit/fixtures/wp-api-generated.js Show resolved Hide resolved

t-hamano added 3 commits October 15, 2025 20:44

Try to fix JS API Tests

4833d19

"block comments" to "notes"

35375c8

Try to fix JS API Tests (Take 2)

4ab0abf

Mamaduka reviewed Oct 15, 2025

View reviewed changes

tests/phpunit/tests/rest-api/rest-comments-controller.php Show resolved Hide resolved

TimothyBJacobs reviewed Oct 15, 2025

View reviewed changes

WordPress deleted a comment from new372957-sudo Oct 15, 2025

t-hamano and others added 8 commits October 16, 2025 09:49

Delete unnecessary empty line

a208f84

Co-authored-by: Timothy Jacobs <[email protected]>

Simplify note support check

a21c51f

Co-authored-by: Timothy Jacobs <[email protected]>

Removed redundant empty check

992a3bd

Define default value for comment type as a schema

f0ee469

Updated function name for registering comment meta

48cb687

Remove redundant check from comment meta registration

278d274

Make filterable

a43a2b0

Don't count Note comments in the dashboard UI

a643878

t-hamano commented Oct 16, 2025

View reviewed changes

github-actions bot mentioned this pull request Oct 16, 2025

PHP backports for WP 6.9 WordPress/gutenberg#72379

Open

WordPress deleted a comment from ziyaab337-eng Oct 16, 2025

swissspidy self-requested a review October 17, 2025 09:40

Merge branch 'trunk' into 64096-notes-backport

6eb536a

Mamaduka requested review from TimothyBJacobs and kadamwhite and removed request for kadamwhite October 17, 2025 13:19

adamsilverstein reviewed Oct 17, 2025

View reviewed changes

src/wp-includes/comment.php Outdated Show resolved Hide resolved

adamsilverstein approved these changes Oct 17, 2025

View reviewed changes

Update PHPDoc comment

4edfc8d

Co-authored-by: Adam Silverstein <[email protected]>

Mamaduka approved these changes Oct 20, 2025

View reviewed changes

Incorporating foundation of "Notes" feature #10280

Are you sure you want to change the base?

Incorporating foundation of "Notes" feature #10280

Conversation

t-hamano commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

t-hamano commented Oct 15, 2025

Uh oh!

Uh oh!

Mamaduka commented Oct 15, 2025

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TimothyBJacobs commented Oct 15, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

swissspidy commented Oct 16, 2025

Uh oh!

Mamaduka commented Oct 17, 2025

Uh oh!

t-hamano commented Oct 17, 2025

Uh oh!

Uh oh!

adamsilverstein left a comment

Choose a reason for hiding this comment

Uh oh!

Mamaduka left a comment

Choose a reason for hiding this comment

Uh oh!

t-hamano commented Oct 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

t-hamano commented Oct 15, 2025 •

edited

Loading