Merge branch 'trunk' into feat/content-gate-restriction-rules

Author: dkoo

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [6.26.0](https://github.com/Automattic/newspack-plugin/compare/v6.25.1...v6.26.0) (2025-12-02)
+
+
+### Features
+
+* **content-gifting:** metering support and CTA auth links ([#4331](https://github.com/Automattic/newspack-plugin/issues/4331)) ([8d5f500](https://github.com/Automattic/newspack-plugin/commit/8d5f50058fc5661f985066306cacc8d03f1c3d20))
+
+## [6.25.1](https://github.com/Automattic/newspack-plugin/compare/v6.25.0...v6.25.1) (2025-11-25)
+
+
+### Bug Fixes
+
+* **memberships:** use gate ID for metering meta key ([#4316](https://github.com/Automattic/newspack-plugin/issues/4316)) ([a190a47](https://github.com/Automattic/newspack-plugin/commit/a190a477ad7af079af4fd27659cc8f735f735f42))
+
 # [6.25.0](https://github.com/Automattic/newspack-plugin/compare/v6.24.3...v6.25.0) (2025-11-24)
 
 

includes/content-gate/class-content-gate.php

@@ -74,6 +74,15 @@ public static function init() {
 		include __DIR__ . '/content-gifting/class-content-gifting.php';
 	}
 
+	/**
+	 * Whether the first-party Newspack feature is enabled.
+	 *
+	 * @return bool
+	 */
+	public static function is_newspack_feature_enabled() {
+		return defined( 'NEWSPACK_CONTENT_GATES' ) && NEWSPACK_CONTENT_GATES;
+	}
+
 	/**
 	 * Restrict the post.
 	 *

includes/content-gate/class-metering.php

@@ -47,7 +47,7 @@ public static function init() {
 	 * @return bool
 	 */
 	public static function restrict_post( $restrict ) {
-		if ( self::is_metering() ) {
+		if ( $restrict && self::is_metering() ) {
 			return false;
 		}
 		return $restrict;
@@ -216,7 +216,15 @@ public static function has_metering( $post_id = null ) {
 	 * @return bool
 	 */
 	public static function is_frontend_metering() {
-		// Frotend metering strategy should only be applied for anonymous readers.
+		/**
+		 * This filter documented in the `is_metering` method.
+		 */
+		$short_circuit = apply_filters( 'newspack_content_gate_metering_short_circuit', null );
+		if ( null !== $short_circuit ) {
+			return false;
+		}
+
+		// Frontend metering strategy should only be applied for anonymous readers.
 		if ( \is_user_logged_in() ) {
 			return false;
 		}
@@ -248,6 +256,14 @@ public static function is_frontend_metering() {
 	 * @return bool
 	 */
 	public static function is_logged_in_metering_allowed( $post_id = null ) {
+		/**
+		 * This filter documented in the `is_metering` method.
+		 */
+		$short_circuit = apply_filters( 'newspack_content_gate_metering_short_circuit', null );
+		if ( null !== $short_circuit ) {
+			return false;
+		}
+
 		if ( ! $post_id ) {
 			$post_id = get_the_ID();
 		}
@@ -272,7 +288,8 @@ public static function is_logged_in_metering_allowed( $post_id = null ) {
 		}
 
 		// Aggregate metering by gate priority, if available.
-		$user_meta_key = self::METERING_META_KEY . '_' . ( $priority ? $priority : $gate_post_id );
+		$suffix = Content_Gate::is_newspack_feature_enabled() && $priority ? $priority : $gate_post_id;
+		$user_meta_key = self::METERING_META_KEY . '_' . $suffix;
 
 		$updated_user_data  = false;
 		$user_metering_data = \get_user_meta( get_current_user_id(), $user_meta_key, true );
@@ -327,6 +344,24 @@ public static function is_logged_in_metering_allowed( $post_id = null ) {
 	 * @return bool
 	 */
 	public static function is_metering() {
+		/**
+		 * Short-circuit the metering check. Anything other than null
+		 * will prevent the metering logic from running.
+		 *
+		 * The `is_logged_in_metering_allowed` method also updates the user meta
+		 * to track the content that's been allowed to access. This short-circuit
+		 * prevents this from running if we want the entire metering feature to be
+		 * skipped.
+		 *
+		 * @param mixed $short_circuit Short-circuit value. Default is null.
+		 *
+		 * @return mixed Short-circuit value.
+		 */
+		$short_circuit = apply_filters( 'newspack_content_gate_metering_short_circuit', null );
+		if ( null !== $short_circuit ) {
+			return false;
+		}
+
 		return self::is_frontend_metering() || self::is_logged_in_metering_allowed();
 	}
 

includes/content-gate/content-gifting/class-content-gifting-cta.php

@@ -175,7 +175,18 @@ public static function print_cta() {
 		<div class="newspack-ui">
 			<div class="banner newspack-content-gifting__cta <?php echo esc_attr( $style_class ); ?>">
 				<div class="wrapper newspack-content-gifting__cta__content">
-					<span class="newspack-ui__font--s"><?php echo esc_html( self::get_cta_label() ); ?></span>
+					<div class="newspack-ui__font--s">
+						<?php echo esc_html( self::get_cta_label() ); ?>
+						<?php if ( ! is_user_logged_in() ) : ?>
+							<div class="newspack-ui__font--xs newspack-content-gifting__cta__content__links">
+								<?php if ( Metering::has_metering( get_the_ID() ) ) : ?>
+									<a href="#register_modal"><?php echo esc_html( __( 'Create an account', 'newspack-plugin' ) ); ?></a>
+								<?php else : ?>
+									<a href="#signin_modal"><?php echo esc_html( __( 'Sign in to an existing account', 'newspack-plugin' ) ); ?></a>
+								<?php endif; ?>
+							</div>
+						<?php endif; ?>
+					</div>
 					<?php self::print_subscribe_button(); ?>
 				</div>
 			</div>

includes/content-gate/content-gifting/class-content-gifting.php

@@ -41,6 +41,7 @@ public static function init() {
 		add_action( 'init', [ __CLASS__, 'hook_gift_button' ] );
 		add_action( 'wp', [ __CLASS__, 'unrestrict_content' ], 5 );
 		add_filter( 'newspack_content_gate_restrict_post', [ __CLASS__, 'restrict_post' ] );
+		add_filter( 'newspack_content_gate_metering_short_circuit', [ __CLASS__, 'short_circuit_metering' ] );
 		add_action( 'wp_enqueue_scripts', [ __CLASS__, 'enqueue_assets' ] );
 		add_action( 'admin_enqueue_scripts', [ __CLASS__, 'enqueue_assets' ] );
 		add_action( 'wp_ajax_' . self::GENERATE_ACTION, [ __CLASS__, 'ajax_generate_content_key' ] );
@@ -155,7 +156,7 @@ public static function print_gift_button() {
 	 * Whether the current post has been gifted.
 	 *
 	 * @param int|null    $post_id The post ID. Default is the current post.
-	 * @param string|null $key     The content key. Default is the key from the query arg.
+	 * @param string|null $key     The content key. Default is from the request (query arg or cookie).
 	 *
 	 * @return bool
 	 */
@@ -396,26 +397,6 @@ public static function can_use_gifting( $return_errors = false ) {
 			$errors->add( 'not_enabled', __( 'Content gifting is not enabled.', 'newspack-plugin' ) );
 		}
 
-		// Check whether all gates have metering enabled.
-		$gates = array_filter(
-			Content_Gate::get_gates(),
-			function( $gate ) {
-				return $gate['status'] === 'publish';
-			}
-		);
-		if ( ! empty( $gates ) ) {
-			$all_gates_have_metering = true;
-			foreach ( $gates as $gate ) {
-				if ( ! isset( $gate['metering']['enabled'] ) || ! $gate['metering']['enabled'] ) {
-					$all_gates_have_metering = false;
-					break;
-				}
-			}
-			if ( $all_gates_have_metering ) {
-				$errors->add( 'all_gates_have_metering', __( 'Content gifting is not available because all gates have metering enabled.', 'newspack-plugin' ) );
-			}
-		}
-
 		if ( $return_errors ) {
 			return $errors;
 		}
@@ -456,21 +437,6 @@ public static function set_enabled( $enabled = true ) {
 		do_action( 'newspack_content_gifting_enabled_status_changed', $enabled );
 	}
 
-	/**
-	 * Whether to render the metering notice in the configuration wizard.
-	 *
-	 * @return bool
-	 */
-	public static function should_render_metering_notice() {
-		$gates = Content_Gate::get_gates();
-		foreach ( $gates as $gate ) {
-			if ( $gate['status'] === 'publish' && isset( $gate['metering'] ) && $gate['metering']['enabled'] ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	/**
 	 * Enqueue assets.
 	 */
@@ -673,6 +639,20 @@ public static function restrict_post( $restrict, $post_id ) {
 		return $restrict;
 	}
 
+	/**
+	 * Short-circuit the metering check.
+	 *
+	 * @param mixed $short_circuit Short-circuit value. Default is null.
+	 *
+	 * @return mixed Short-circuit value.
+	 */
+	public static function short_circuit_metering( $short_circuit ) {
+		if ( self::is_gifted_post( get_the_ID() ) ) {
+			return true;
+		}
+		return $short_circuit;
+	}
+
 	/**
 	 * Whether the current user can gift a given post.
 	 *
@@ -701,10 +681,6 @@ public static function can_gift_post( $post_id = null, $return_errors = false )
 			$errors->add( 'post_restricted', __( 'User does not have access to this post.', 'newspack-plugin' ) );
 		}
 
-		if ( Metering::has_metering( $post_id ) ) {
-			$errors->add( 'metering', __( 'Metered content cannot be gifted.', 'newspack-plugin' ) );
-		}
-
 		if ( $return_errors ) {
 			return $errors;
 		}

includes/wizards/audience/class-audience-content-gates.php

@@ -92,7 +92,7 @@ public function add_page() {
 	 * @return bool
 	 */
 	public function is_feature_enabled() {
-		return defined( 'NEWSPACK_CONTENT_GATES' ) && NEWSPACK_CONTENT_GATES;
+		return Content_Gate::is_newspack_feature_enabled();
 	}
 
 	/**

includes/wizards/audience/class-audience-wizard.php

@@ -107,9 +107,18 @@ public function enqueue_scripts_and_styles() {
 
 		$data['is_skipped_campaign_setup'] = Reader_Activation::is_skipped( 'ras_campaign' );
 
+		$gates        = Content_Gate::get_gates();
+		$has_metering = false;
+		foreach ( $gates as $gate ) {
+			if ( $gate['status'] === 'publish' && isset( $gate['metering'] ) && $gate['metering']['enabled'] ) {
+				$has_metering = true;
+				break;
+			}
+		}
+
 		$data['content_gifting'] = [
 			'can_use_gifting' => Content_Gifting::can_use_gifting( true ),
-			'metering_notice' => Content_Gifting::should_render_metering_notice(),
+			'has_metering'    => $has_metering,
 		];
 
 		wp_enqueue_script( 'newspack-wizards' );

newspack.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Newspack
  * Description: An advanced open-source publishing and revenue-generating platform for news organizations.
- * Version: 6.25.0
+ * Version: 6.26.0
  * Author: Automattic
  * Author URI: https://newspack.com/
  * License: GPL2
@@ -14,7 +14,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'NEWSPACK_PLUGIN_VERSION', '6.25.0' );
+define( 'NEWSPACK_PLUGIN_VERSION', '6.26.0' );
 
 // Define NEWSPACK_PLUGIN_FILE.
 if ( ! defined( 'NEWSPACK_PLUGIN_FILE' ) ) {

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "newspack",
-	"version": "6.25.0",
+	"version": "6.26.0",
 	"description": "The Newspack plugin. https://newspack.com",
 	"bugs": {
 		"url": "https://github.com/Automattic/newspack-plugin/issues"