Do redirect if amp comments_live_list support is not declared; vary comment success message by approval status #1029

DavidCramer · 2018-03-20T12:26:57Z

fixes #1028
fixes #936

DavidCramer · 2018-03-20T12:51:12Z

@westonruter you can take a look at this now. I've included #936 as well, since they are closely related.

westonruter · 2018-03-20T15:48:50Z

@DavidCramer I don't see how #936 is included here. I was expecting to see something like this: #1020 (comment)

DavidCramer · 2018-03-20T15:51:33Z

@westonruter - I was basing it on your second thought - #1020 (comment)

DavidCramer · 2018-03-20T15:55:30Z

@westonruter - I see I missed the filter, sorry. ignore me, I'll revised it.

westonruter

The theme support flag does not seem to work with the changes here. When I add the the comments_live_list flag (xwp/ampnews#85) there is still a redirect.

westonruter · 2018-03-21T00:18:34Z

includes/class-amp-theme-support.php

+				$url = add_query_arg( 'comment', $comment->comment_ID, $url );
+
+				// Send redirect header if amp-live-list has been opted-out.
+				if ( empty( $theme_support['comments_live_list'] ) ) {


This doesn't work because $theme_support is an array of the args so it needs to be looking at $theme_support[0]['comments_live_list']

westonruter · 2018-03-21T00:19:00Z

includes/class-amp-theme-support.php

+
+				// Send redirect header if amp-live-list has been opted-out.
+				if ( empty( $theme_support['comments_live_list'] ) ) {
+					header( 'AMP-Redirect-To: ' . $url, true );


This shouldn't be necessary because wp_redirect() is currently being called. It only needs to return the $url

westonruter · 2018-03-21T00:19:14Z

includes/class-amp-theme-support.php

+				} else {
+					$message = __( 'Your comment has been posted, and is awaiting moderation.', 'default' );
+				}
+


Missing phpdoc.

westonruter · 2018-03-21T00:21:06Z

includes/class-amp-theme-support.php

+				if ( '1' === (string) $comment->comment_approved ) {
+					$message = __( 'Your comment has been posted and has been approved.', 'amp' );
+				} else {
+					$message = __( 'Your comment has been posted, and is awaiting moderation.', 'default' );


This string has the default text domain because it is re-using a string in core:

https://github.com/WordPress/wordpress-develop/blob/8f95800d52c1736d651ae6e259f90ad4a0db2c3f/src/wp-includes/class-walker-comment.php#L285

We need it to keep it the same for it to re-use core translations.

westonruter · 2018-03-21T00:21:35Z

includes/class-amp-theme-support.php

@@ -516,7 +536,7 @@ public static function add_amp_comment_form_templates() {
 		?>
 		<div submit-success>
 			<template type="amp-mustache">
-				<?php esc_html_e( 'Your comment has been posted, but may be subject to moderation.', 'amp' ); ?>
+				{{{data}}}


This should have a paragraph wrapping it, like for the error message.

westonruter · 2018-03-21T00:22:17Z

includes/class-amp-theme-support.php

@@ -516,7 +536,7 @@ public static function add_amp_comment_form_templates() {
 		?>
 		<div submit-success>
 			<template type="amp-mustache">
-				<?php esc_html_e( 'Your comment has been posted, but may be subject to moderation.', 'amp' ); ?>
+				{{{data}}}


The error handler sends back an object with an error key. I think this should be similarly looking for an object returned with just a message key.

westonruter · 2018-03-21T00:22:52Z

includes/class-amp-theme-support.php

 				// We don't need any data, so just send a success.
-				wp_send_json_success();
-			}, PHP_INT_MAX );
+				wp_send_json_success( $message );


We should probably apply kses to this to only allow the allowed amp-mustache markup.

westonruter · 2018-03-21T00:23:08Z

includes/class-amp-theme-support.php

+				}
+
+				$message = apply_filters( 'amp_comment_submitted_message', $message, $comment );
+
 				// We don't need any data, so just send a success.


This comment is no longer true.

* Explicitly limit handle_xhr_request to POST requests. * Make sure original status header is sent back in wp_die() call. * Fix reading of amp theme support flag since get_theme_support() returns an array of args. * Add missing paragraph surrounding success message template. * Fix moderation comment to ensure default core string is re-used. * Fix PHP notice in regards to additional comment_live_list theme support flag being present. * Remove obsolete comments. * Simplify success message. * Add phpdoc for amp_comment_posted_message filter. * Pass back success message in same way as error message is returned as named variable. * Add missing tests and introduce \AMP_Theme_Support::send_header() to avoid having to runInSeparateProcess.

westonruter · 2018-03-21T00:53:49Z

@DavidCramer Please test these changes with the corresponding changes in the theme PR xwp/ampnews#85

Test submitting comments with the comments_live_list flag enabled and disabled. Also test Jetpack comment form to ensure it continues to work as expected. It is working for me.

DavidCramer · 2018-03-21T05:37:45Z

@westonruter Thanks for those changes. I've gone over them to get better understanding of it all. Will review and test xwp/ampnews#85

ThierryA

Great work! Minor review below

ThierryA · 2018-03-21T15:54:08Z

includes/class-amp-theme-support.php

+		if ( empty( $theme_support[0]['comments_live_list'] ) ) {
+
+			// Add the comment ID to the URL to force AMP to refresh the page.
+			$url = add_query_arg( 'comment', $comment->comment_ID, $url );


Return statement can happen on this line, no need to assign it to a var.

Good point, but the idea is that eventually this should not be necessary at all. I've opened an issue in amphtml to address this and I'll add a comment here to reference it: ampproject/amphtml#14170

ThierryA · 2018-03-21T16:17:37Z

includes/class-amp-theme-support.php

+	 * }
+	 */
+	public static function handle_wp_die( $error, $title = '', $args = array() ) {
+		$status_code = 500;


That could move in a else statement at the end of the statements below.

westonruter · 2018-03-21T16:38:20Z

includes/class-amp-theme-support.php

-				wp_send_json_success();
-			}, PHP_INT_MAX );
-			self::handle_xhr_headers_output();
-		} elseif ( ! empty( self::$purged_amp_query_vars['_wp_amp_action_xhr_converted'] ) ) {


I realized that we're now not properly looking at _wp_amp_action_xhr_converted.

On further thought, I don't think the logic this function cares if _wp_amp_action_xhr_converted. If someone is implementing their own action-xhr endpoint, then they're not going to be doing wp_redirect() anyway, but rather should be responding with their own appropriate wp_send_json() call.

Improve default status_code handling

add amp-redirect if amp-live-list is not declared

fb649cc

DavidCramer requested a review from westonruter March 20, 2018 12:27

Add message to response based on comment approval

6f00f20

westonruter mentioned this pull request Mar 21, 2018

Add support for comments_live_list theme support flag xwp/ampnews#85

Merged

westonruter requested changes Mar 21, 2018

View reviewed changes

westonruter added 2 commits March 20, 2018 17:31

Add validation for __amp_source_origin

1e32d6c

westonruter changed the title ~~#1028 - add amp-redirect if amp-live-list is not declared~~ Do redirect if amp comments_live_list support is not declared; vary comment success message by approval status Mar 21, 2018

westonruter approved these changes Mar 21, 2018

View reviewed changes

westonruter requested a review from ThierryA March 21, 2018 00:53

westonruter added this to the v0.7 milestone Mar 21, 2018

Use scheme-less URL for redirect if non-HTTPS

5c96324

ThierryA approved these changes Mar 21, 2018

View reviewed changes

westonruter reviewed Mar 21, 2018

View reviewed changes

Improve comments regarding XHR handling

8da1a36

Improve default status_code handling

westonruter merged commit f957712 into 0.7 Mar 21, 2018

westonruter deleted the add/1028-amp-live-list-opt-in branch March 21, 2018 21:02

swissspidy mentioned this pull request Jan 2, 2019

Missing confirmation message after posting comment #1792

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Do redirect if amp comments_live_list support is not declared; vary comment success message by approval status #1029

Do redirect if amp comments_live_list support is not declared; vary comment success message by approval status #1029

DavidCramer commented Mar 20, 2018 •

edited

DavidCramer commented Mar 20, 2018

westonruter commented Mar 20, 2018

DavidCramer commented Mar 20, 2018

DavidCramer commented Mar 20, 2018

westonruter left a comment

westonruter Mar 21, 2018

westonruter Mar 21, 2018

westonruter Mar 21, 2018

westonruter Mar 21, 2018

westonruter Mar 21, 2018

westonruter Mar 21, 2018

westonruter Mar 21, 2018

westonruter Mar 21, 2018

westonruter commented Mar 21, 2018

DavidCramer commented Mar 21, 2018

ThierryA left a comment

ThierryA Mar 21, 2018

westonruter Mar 21, 2018

ThierryA Mar 21, 2018

westonruter Mar 21, 2018

westonruter Mar 21, 2018

Do redirect if amp comments_live_list support is not declared; vary comment success message by approval status #1029

Do redirect if amp comments_live_list support is not declared; vary comment success message by approval status #1029

Conversation

DavidCramer commented Mar 20, 2018 • edited

DavidCramer commented Mar 20, 2018

westonruter commented Mar 20, 2018

DavidCramer commented Mar 20, 2018

DavidCramer commented Mar 20, 2018

westonruter left a 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

westonruter commented Mar 21, 2018

DavidCramer commented Mar 21, 2018

ThierryA left a 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

DavidCramer commented Mar 20, 2018 •

edited