Comments: Redirect front-end comment edit links to Calypso. #8069

kwight · 2017-10-27T23:24:53Z

Needs Automattic/wp-calypso#20777.

Just as we've added the ability to redirect front-end post and page edit links to Calypso in #7732 , this PR gives the same treatment to front-end comment edit links. The same Jetpack option is used for activating (edit_links_calypso_redirect).

When this option is enabled, comment edit links will be filtered with an href pointing to Calypso, in the format /comments/all/:site?commentId=:comment-id&action=edit.

See Automattic/wp-calypso#17221.

Testing

Switch to this branch.
Ensure the option returns as enabled. One way is to edit class.jetpack.php L619 and replace the first check Jetpack::get_option( 'edit_links_calypso_redirect' ) with just true.
Verify that a front-end Edit link for a comment redirects to Calypso.

Proposed changelog entry for your changes:

Edit links for comments in the frontend can redirect to calypso if the Jetpack option edit_links_calypso_redirect is enabled

vindl · 2017-10-30T14:47:08Z

class.jetpack.php

-			add_filter( 'get_edit_post_link', array( $this, 'point_edit_links_to_calypso' ), 1, 2 );
+		if ( Jetpack::get_option( 'edit_links_calypso_redirect' ) && ! is_admin() ) {
+			add_filter( 'get_edit_post_link', array( $this, 'point_edit_post_links_to_calypso' ), 1, 2 );
+			add_filter( 'edit_comment_link', array( $this, 'point_edit_comment_links_to_calypso' ), 1, 3 );


I think it would be more appropriate to use get_edit_comment_link filter here instead, the same way as we do for edit post links.

I... could have sworn I looked for that, and didn't find it 🙃 Yep, for sure, much easier.

vindl · 2017-10-30T14:49:07Z

class.jetpack.php

@@ -669,6 +670,15 @@ function point_edit_links_to_calypso( $default_url, $post_id ) {
 		return esc_url( sprintf( 'https://wordpress.com/%s/%s/%d', $path_prefix, $site_slug, $post_id ) );
 	}

+	function point_edit_comment_links_to_calypso( $link, $comment_id, $text ) {
+		$url = wp_parse_url( get_home_url() );


I'm pretty sure this is going to break on Jetpack sites with subfolder installs. I suggest following the existing pattern in point_edit_post_links_to_calypso to avoid that:

$site_slug = Jetpack::build_raw_urls( get_home_url() );

vindl · 2017-10-30T14:50:19Z

class.jetpack.php

@@ -669,6 +670,15 @@ function point_edit_links_to_calypso( $default_url, $post_id ) {
 		return esc_url( sprintf( 'https://wordpress.com/%s/%s/%d', $path_prefix, $site_slug, $post_id ) );
 	}

+	function point_edit_comment_links_to_calypso( $link, $comment_id, $text ) {
+		$url = wp_parse_url( get_home_url() );
+		$html = sprintf( '<a class="comment-edit-link" href="%s">%s</a>',


Once we switch to get_edit_comment_link filter, we can simplify this part - we'll only need to return the href.

Thanks @vindl ! Updated in 64643f8.

gwwar · 2017-10-30T20:38:49Z

class.jetpack.php

@@ -669,6 +670,14 @@ function point_edit_links_to_calypso( $default_url, $post_id ) {
 		return esc_url( sprintf( 'https://wordpress.com/%s/%s/%d', $path_prefix, $site_slug, $post_id ) );
 	}

+	function point_edit_comment_links_to_calypso( $url ) {
+		wp_parse_str( wp_parse_url( $url, PHP_URL_QUERY ), $query_args );


Could you walk me through what's happening here? Does wp_parse_url not return an array of the url parts?

Sure. PHP_URL_QUERY says, "just return the query key value of that array as a string" (it's the only part we're interested in). wp_parse_str (which uses parse_str) parses the query params it finds in that string and assigns them to the $query_args array. The one we want that contains the comment id is the c param (which is awkwardly assigned as amp;c).

I could just use basic regex (\d+$?) to strip whatever number off the end of the string, but that feels a little more fragile over time.

Does the caller not have access to the comment id here?

I'd at the least add a quick comment since amp;c is a bit unexpected

Sure, good idea; added in 948498f.

gwwar · 2017-10-30T20:40:22Z

class.jetpack.php

@@ -669,6 +670,14 @@ function point_edit_links_to_calypso( $default_url, $post_id ) {
 		return esc_url( sprintf( 'https://wordpress.com/%s/%s/%d', $path_prefix, $site_slug, $post_id ) );
 	}

+	function point_edit_comment_links_to_calypso( $url ) {


Any reason why the signature is different for this function versus point_edit_post_links_to_calypso? I think it's clearer to pass through a fallback and a comment id explicitly.

point_edit_post_links_to_calypso is hooked to get_edit_post_link, which passes in the original link, the post ID (very convenient for our needs), and a context (not needed in our situation, so we only grab the first two ).

The get_edit_comment_link filter, however, only gives us the link we'll be filtering, hence all the parsing madness.

👍 Got it thanks for clarifying!

`point_edit_comment_links_to_calypso`.

rodrigoi · 2017-12-14T16:33:24Z

class.jetpack.php

+	function point_edit_comment_links_to_calypso( $url ) {
+		// Take the `query` key value from the URL, and parse its parts to the $query_args. `amp;c` matches the comment ID.
+		wp_parse_str( wp_parse_url( $url, PHP_URL_QUERY ), $query_args );
+		return esc_url( sprintf( 'https://wordpress.com/comments/all/%s/?commentId=%d&action=edit',


@kwight the hotlink for edit will be https://wordpress.com/comment/{site_slug}/{comment_id}?action=edit

This is Calypso's PR Automattic/wp-calypso#20777

gwwar · 2017-12-20T22:32:54Z

Urls look correct here. @rodrigoi could you update the related wpcom diff to match?

vindl

LGTM!

oskosk

Tests well and code looks good.

Comments: Redirect front-end comment edit links to Calypso.

d131f60

kwight requested a review from a team as a code owner October 27, 2017 23:24

kwight requested a review from a team October 27, 2017 23:25

kwight added [Feature] Comments [Status] In Progress labels Oct 27, 2017

kwight mentioned this pull request Oct 27, 2017

Comments: Comment "Edit" link in front end. Automattic/wp-calypso#17221

Closed

vindl reviewed Oct 30, 2017

View reviewed changes

Use get_edit_comment_link hook instead of edit_comment_link.

539bded

gwwar reviewed Oct 30, 2017

View reviewed changes

vindl assigned kwight Nov 2, 2017

Add a comment explaining the URL parsing in

948498f

`point_edit_comment_links_to_calypso`.

gwwar mentioned this pull request Nov 27, 2017

Comments: Moderation Emails Overrides #8144

Merged

rodrigoi reviewed Dec 14, 2017

View reviewed changes

rodrigoi mentioned this pull request Dec 14, 2017

Comments: edit action for single comment view Automattic/wp-calypso#20777

Merged

Update the URL format for comment edits.

64643f8

kwight added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] In Progress labels Dec 15, 2017

kwight requested a review from a team December 15, 2017 16:52

rodrigoi mentioned this pull request Dec 19, 2017

Comments: Moderation Hotlinks Automattic/wp-calypso#19774

Closed

6 tasks

vindl added this to the 5.7 milestone Dec 22, 2017

vindl approved these changes Dec 22, 2017

View reviewed changes

vindl added the [Pri] BLOCKER label Dec 22, 2017

oskosk approved these changes Dec 26, 2017

View reviewed changes

oskosk added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Dec 26, 2017

oskosk merged commit 5ad8100 into master Dec 26, 2017

oskosk deleted the add/edit-comments-to-calypso branch December 26, 2017 20:18

oskosk added the [Status] Has Changelog label Dec 26, 2017

kraftbj removed the [Status] Ready to Merge Go ahead, you can push that green button! label Oct 13, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments: Redirect front-end comment edit links to Calypso. #8069

Comments: Redirect front-end comment edit links to Calypso. #8069

kwight commented Oct 27, 2017 •

edited by oskosk

Loading

vindl Oct 30, 2017

kwight Oct 30, 2017

vindl Oct 30, 2017

vindl Oct 30, 2017

kwight Dec 14, 2017

gwwar Oct 30, 2017

kwight Oct 30, 2017

gwwar Oct 30, 2017

gwwar Oct 30, 2017

kwight Nov 2, 2017

gwwar Oct 30, 2017

kwight Oct 31, 2017

gwwar Oct 31, 2017

rodrigoi Dec 14, 2017

gwwar commented Dec 20, 2017

vindl left a comment

oskosk left a comment

Comments: Redirect front-end comment edit links to Calypso. #8069

Comments: Redirect front-end comment edit links to Calypso. #8069

Conversation

kwight commented Oct 27, 2017 • edited by oskosk Loading

Proposed changelog entry for your changes:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gwwar commented Dec 20, 2017

vindl left a comment

Choose a reason for hiding this comment

oskosk left a comment

Choose a reason for hiding this comment

kwight commented Oct 27, 2017 •

edited by oskosk

Loading