Merge pull request #3538 from Automattic/alpha

Release Nov 11

.github/labeler.yml

@@ -0,0 +1,2 @@
+needs-changelog:
+ - base-branch: ['trunk']

.github/workflows/changelog.yml

@@ -0,0 +1,36 @@
+name: "Pull Request Labeler"
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  labeler:
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
+
+  comment_pr:
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    name: Comment about the change log label
+    steps:
+      - name: Comment PR
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          message: |
+            Hey @${{ github.event.pull_request.assignee.login }}, good job getting this PR merged! :tada:
+
+            Now, the `needs-changelog` label has been added to it.
+
+            Please check if this PR needs to be included in the "Upcoming Changes" and "Release Notes" doc. If it doesn't, simply remove the label.
+
+            If it does, please add an entry to it to our shared document, with screenshots and testing instructions if applicable, then remove the label.
+
+            Thank you! :heart:

includes/class-logger.php

@@ -76,4 +76,41 @@ private static function get_pid() {
 	public static function error( $payload, $header = 'NEWSPACK' ) {
 		return self::log( $payload, $header, 'error' );
 	}
+
+	/**
+	 * A logger for newspack manager logging.
+	 *
+	 * @param string $code      The log code (i.e. newspack_google_login).
+	 * @param string $message   The message to log.
+	 * @param array  $data      The data to log.
+	 *      Optional. Additional parameters.
+	 *      @type string $user_email The current users email address.
+	 *      @type file   $file       The name of the file to write the local log to.
+	 * @param string $type      The type of log. Defaults to 'error'.
+	 * @param string $log_level The Log level.
+	 */
+	public static function newspack_log( $code, $message, $data, $type = 'error', $log_level = 2 ) {
+		$email = '';
+		if ( isset( $data['user_email'] ) ) {
+			$email = $data['user_email'];
+			unset( $data['user_email'] );
+		}
+		$file = $code;
+		if ( isset( $data['file'] ) ) {
+			$file = $data['file'];
+			unset( $data['file'] );
+		}
+		do_action(
+			'newspack_log',
+			$code,
+			$message,
+			[
+				'type'       => $type,
+				'data'       => $data,
+				'user_email' => $email,
+				'file'       => $file,
+				'log_level'  => $log_level,
+			]
+		);
+	}
 }

includes/class-newspack-image-credits.php

@@ -421,7 +421,8 @@ function( $setting ) use ( $key ) {
 					return $setting['key'] === $key;
 				}
 			);
-			return reset( array_values( $setting ) );
+			$setting_values = array_values( $setting );
+			return reset( $setting_values );
 		}
 
 		return $default_settings;
@@ -560,7 +561,7 @@ public static function populate_credit( $metadata, $attachment_id, $context ) {
 	 */
 	public static function register_meta() {
 		foreach ( [
-			static::MEDIA_CREDIT_META, 
+			static::MEDIA_CREDIT_META,
 			static::MEDIA_CREDIT_URL_META,
 			static::MEDIA_CREDIT_ORG_META,
 			static::MEDIA_CREDIT_CAN_DISTRIBUTE_META,

includes/class-newspack.php

@@ -155,6 +155,7 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-jetpack.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-gravityforms.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/google-site-kit/class-googlesitekit.php';
+		include_once NEWSPACK_ABSPATH . 'includes/plugins/google-site-kit/class-googlesitekit-logger.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-mailchimp-for-woocommerce.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-onesignal.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-organic-profile-block.php';

includes/cli/class-co-authors-plus.php

@@ -161,7 +161,7 @@ public function backfill_non_editing_contributor( $args, $assoc_args ) {
 		$users = get_users(
 			[
 				'role__in'     => [ 'subscriber', 'customer' ],
-				'role__not_in' => [ \Newspack\Co_Authors_Plus::CONTRIBUTOR_NO_EDIT_ROLE_NAME, 'administrator', 'editor', 'author', 'contributor' ],
+				'role__not_in' => [ \Newspack\Guest_Contributor_Role::CONTRIBUTOR_NO_EDIT_ROLE_NAME, 'administrator', 'editor', 'author', 'contributor' ],
 				'fields'       => 'ID',
 				'number'       => -1,
 			]
@@ -170,7 +170,7 @@ public function backfill_non_editing_contributor( $args, $assoc_args ) {
 			if ( count_user_posts( $user_id ) > 0 ) { // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.count_user_posts_count_user_posts
 				if ( self::$live ) {
 					WP_CLI::line( sprintf( 'Will add the Non-Editing Contributor role to user %d.', $user_id ) );
-					get_user_by( 'id', $user_id )->add_role( \Newspack\Co_Authors_Plus::CONTRIBUTOR_NO_EDIT_ROLE_NAME );
+					get_user_by( 'id', $user_id )->add_role( \Newspack\Guest_Contributor_Role::CONTRIBUTOR_NO_EDIT_ROLE_NAME );
 				} else {
 					WP_CLI::line( sprintf( 'Would add the Non-Editing Contributor role to user %d.', $user_id ) );
 				}
@@ -266,7 +266,7 @@ function( $value ) {
 				'user_nicename'   => isset( $post_meta['cap-user_login'] ) ? $post_meta['cap-user_login'] : '',
 				'user_url'        => isset( $post_meta['cap-website'] ) ? $post_meta['cap-website'] : '',
 				'user_pass'       => wp_generate_password(),
-				'role'            => \Newspack\Co_Authors_Plus::CONTRIBUTOR_NO_EDIT_ROLE_NAME,
+				'role'            => \Newspack\Guest_Contributor_Role::CONTRIBUTOR_NO_EDIT_ROLE_NAME,
 				'display_name'    => isset( $post_meta['cap-display_name'] ) ? $post_meta['cap-display_name'] : '',
 				'first_name'      => isset( $post_meta['cap-first_name'] ) ? $post_meta['cap-first_name'] : '',
 				'last_name'       => isset( $post_meta['cap-last_name'] ) ? $post_meta['cap-last_name'] : '',
@@ -420,7 +420,7 @@ private static function migrate_linked_guest_authors() {
 			self::assign_user_meta( $guest_author, $user_id );
 
 			// Add the Non-Editing Contributor role.
-			$linked_user->add_role( \Newspack\Co_Authors_Plus::CONTRIBUTOR_NO_EDIT_ROLE_NAME );
+			$linked_user->add_role( \Newspack\Guest_Contributor_Role::CONTRIBUTOR_NO_EDIT_ROLE_NAME );
 		}
 	}
 

includes/data-events/README.md

@@ -91,6 +91,8 @@ For when there's a new donation processed through WooCommerce.
 | `is_renewal`      | `bool`   | If this is a subscription renewal (recurring payment)  |
 | `subscription_id` | `int`    | The related subscription id (if any)                   |
 | `platform_data`   | `array`  |                                                        |
+| `user_first_name` | `string` | The Woocommerce customer billing first name            |
+| `user_last_name`  | `string` | The Woocommerce customer billing last name             |
 
 ### `woocommerce_order_failed`
 
@@ -111,6 +113,8 @@ the order is already marked as failed so this hook will not trigger.
 | `subscription_id` | `int`    | The related subscription id (if any)                   |
 | `popup_id`        | `string` | If the donation was triggered by a popup, the popup ID |
 | `platform_data`   | `array`  |                                                        |
+| `user_first_name` | `string` | The Woocommerce customer billing first name            |
+| `user_last_name`  | `string` | The Woocommerce customer billing last name             |
 
 ### `donation_new`
 
@@ -129,6 +133,8 @@ When there's a new donation.
 | `is_renewal`      | `bool`   | If this is a subscription renewal (recurring payment)  |
 | `subscription_id` | `int`    | The related subscription id (if any)                   |
 | `platform_data`   | `array`  |                                                        |
+| `user_first_name` | `string` |                                                        |
+| `user_last_name`  | `string` |                                                        |
 
 ### `order_completed`
 
@@ -146,6 +152,8 @@ When any WooCommerce order is completed with a successful payment.
 | `is_renewal`      | `bool`   | If this is a subscription renewal (recurring payment)  |
 | `subscription_id` | `int`    | The related subscription id (if any)                   |
 | `platform_data`   | `array`  |                                                        |
+| `user_first_name` | `string` |                                                        |
+| `user_last_name`  | `string` |                                                        |
 
 ### `donation_subscription_new`
 
@@ -162,6 +170,8 @@ When there's a new WooCommerce Subscription. This action does not replace the `d
 | `platform`        | `string` |                                                        |
 | `referer`         | `string` |                                                        |
 | `popup_id`        | `string` | If the donation was triggered by a popup, the popup ID |
+| `user_first_name` | `string` |                                                        |
+| `user_last_name`  | `string` |                                                        |
 
 ### `donation_subscription_cancelled`
 
@@ -176,6 +186,8 @@ When a WooCommerce Subscription is cancelled.
 | `currency`        | `string` |
 | `recurrence`      | `string` |
 | `platform`        | `string` |
+| `user_first_name` | `string` |
+| `user_last_name`  | `string` |
 
 ### `donation_subscription_changed`
 
@@ -192,6 +204,8 @@ When a WooCommerce Subscription status changes.
 | `currency`        | `string` |
 | `recurrence`      | `string` |
 | `platform`        | `string` |
+| `user_first_name` | `string` |
+| `user_last_name`  | `string` |
 
 ### `product_subscription_changed`
 
@@ -207,6 +221,8 @@ When a non-donation subscription status changes.
 | `recurrence`      | `string` |
 | `status_before`   | `string` |
 | `status_after`    | `string` |
+| `user_first_name` | `string` |
+| `user_last_name`  | `string` |
 
 ## Membership Actions
 

includes/data-events/class-api.php

@@ -102,7 +102,7 @@ public static function permission_callback() {
 		if ( ! current_user_can( 'manage_options' ) ) {
 			return new \WP_Error(
 				'newspack_rest_forbidden',
-				esc_html__( 'You cannot use this resource.', 'newspack' ),
+				esc_html__( 'You cannot use this resource.', 'newspack-plugin' ),
 				[
 					'status' => 403,
 				]
@@ -129,9 +129,6 @@ private static function get_endpoint_args() {
 					'sanitize_callback' => 'sanitize_text_field',
 				],
 			],
-			'global'       => [
-				'type' => 'boolean',
-			],
 			'disabled'     => [
 				'type' => 'boolean',
 			],
@@ -168,7 +165,7 @@ public static function test_url( $request ) {
 				[
 					'success' => false,
 					'code'    => false,
-					'message' => esc_html__( 'Invalid URL.', 'newspack' ),
+					'message' => esc_html__( 'Invalid URL.', 'newspack-plugin' ),
 				]
 			);
 		}
@@ -249,16 +246,16 @@ public static function upsert_endpoint( $request ) {
 		if ( empty( $args['url'] ) || \esc_url_raw( $args['url'], [ 'https' ] ) !== $args['url'] ) {
 			return new \WP_Error(
 				'newspack_webhooks_invalid_url',
-				esc_html__( 'Invalid URL.', 'newspack' ),
+				esc_html__( 'Invalid URL.', 'newspack-plugin' ),
 				[
 					'status' => 400,
 				]
 			);
 		}
-		if ( ! $args['global'] && empty( $args['actions'] ) ) {
+		if ( empty( $args['actions'] ) ) {
 			return new \WP_Error(
 				'newspack_webhooks_invalid_actions',
-				esc_html__( 'You must select actions to trigger this endpoint. Set it to global if this endpoint is meant for all actions.', 'newspack' ),
+				esc_html__( 'You must select actions to trigger this endpoint.', 'newspack-plugin' ),
 				[
 					'status' => 400,
 				]
@@ -267,15 +264,13 @@ public static function upsert_endpoint( $request ) {
 		if ( empty( $args['id'] ) ) {
 			$endpoint = Webhooks::create_endpoint(
 				$args['url'],
-				$args['actions'] ?? [],
-				$args['global']
+				$args['actions'] ?? []
 			);
 		} else {
 			$endpoint = Webhooks::update_endpoint(
 				$args['id'],
 				$args['url'],
 				$args['actions'] ?? [],
-				$args['global'],
 				$args['disabled']
 			);
 		}