feat(content-gate): implement restriction rules

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

@@ -93,10 +93,12 @@ public static function restrict_post( $post, $query ) {
 		if ( ! $query->is_main_query() ) {
 			return;
 		}
-		if ( self::has_rendered() ) {
+		if ( ! is_singular() ) {
+			return;
+		}
+		if ( get_queried_object_id() !== $post->ID ) {
 			return;
 		}
-
 		// Don't apply our restriction strategy if Woo Memberships is active.
 		if ( Memberships::is_active() ) {
 			return;
@@ -105,9 +107,6 @@ public static function restrict_post( $post, $query ) {
 		if ( is_admin() ) {
 			return;
 		}
-		if ( ! self::has_gate() ) {
-			return;
-		}
 		if ( ! self::is_post_restricted( $post->ID ) ) {
 			return;
 		}
@@ -127,9 +126,7 @@ public static function restrict_post( $post, $query ) {
 
 		$content = self::get_restricted_post_excerpt( $post );
 
-		$content .= self::get_inline_gate_content();
-
-		$post->post_content   = $content;
+		$post->post_content   = $content . self::get_inline_gate_content();
 		$post->post_excerpt   = $content;
 		$post->comment_status = 'closed';
 		$post->comment_count  = 0;
@@ -390,11 +387,13 @@ public static function get_gate_post_id( $post_id = null ) {
 			$gate_post_id = false;
 		}
 
+		$post_id = $post_id ?? get_the_ID();
+
 		/**
 		 * Filters the gate post ID.
 		 *
 		 * @param int $gate_post_id Gate post ID.
-		 * @param int $post_id Post ID.
+		 * @param int $post_id      Post ID.
 		 */
 		return apply_filters( 'newspack_content_gate_post_id', $gate_post_id, $post_id );
 	}
@@ -474,16 +473,11 @@ public static function is_post_restricted( $post_id = null ) {
 
 		/**
 		 * Filters whether the post is restricted for the current user.
-		 * If the post is restricted by a content gate, return the gate post ID.
 		 *
-		 * @param int|bool $restricted_by  If restricted, the gate post ID. False if not restricted.
-		 * @param int  $post_id            Post ID.
+		 * @param bool $restricted_by Whether the post is restricted.
+		 * @param int  $post_id       Post ID.
 		 */
-		$restricted_by = apply_filters( 'newspack_is_post_restricted', false, $post_id );
-		if ( $restricted_by && is_int( $restricted_by ) ) {
-			self::$gate_post_id = $restricted_by;
-		}
-		return $restricted_by;
+		return apply_filters( 'newspack_is_post_restricted', false, $post_id );
 	}
 
 	/**
@@ -627,7 +621,7 @@ public static function get_restricted_post_excerpt( $post ) {
 			$content = apply_filters( 'newspack_gate_content', explode( '<!--more-->', $content )[0] );
 		} else {
 			$content = apply_filters( 'newspack_gate_content', $content );
-			$count = (int) get_post_meta( $gate_post_id, 'visible_paragraphs', true );
+			$count   = max( 1, (int) get_post_meta( $gate_post_id, 'visible_paragraphs', true ) );
 			// Split into paragraphs.
 			$content = explode( '</p>', $content );
 			// Extract the first $x paragraphs only.
@@ -742,7 +736,6 @@ public static function get_gate( $id ) {
 			'id'            => $post->ID,
 			'status'        => $post->post_status,
 			'title'         => $post->post_title,
-			'description'   => $post->post_excerpt,
 			'metering'      => Metering::get_metering_settings( $post->ID ),
 			'priority'      => (int) get_post_meta( $post->ID, 'gate_priority', true ),
 			'access_rules'  => Access_Rules::get_post_access_rules( $post->ID ),

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

@@ -13,12 +13,19 @@
  * Main class.
  */
 class Content_Restriction_Control {
+	/**
+	 * Map of post IDs to gate IDs.
+	 *
+	 * @var array
+	 */
+	private static $post_gate_id_map = [];
 
 	/**
 	 * Initialize hooks and filters.
 	 */
 	public static function init() {
 		add_filter( 'newspack_is_post_restricted', [ __CLASS__, 'is_post_restricted' ], 10, 2 );
+		add_filter( 'newspack_content_gate_post_id', [ __CLASS__, 'get_gate_post_id' ], 10, 2 );
 	}
 
 	/**
@@ -91,36 +98,52 @@ public static function get_available_taxonomies() {
 	 *
 	 * @param int $post_id Optional post ID.
 	 *
-	 * @return int[] Array of gate post IDs.
+	 * @return array Array of post gates.
 	 */
 	public static function get_post_gates( $post_id = null ) {
-		$post_id    = $post_id ?? \get_the_ID();
-		$post_type  = \get_post_type( $post_id );
-		$categories = \wp_get_post_categories( $post_id );
-		$tags       = \wp_get_post_tags( $post_id, [ 'fields' => 'ids' ] );
+		$post_id = $post_id ?? \get_the_ID();
+		if ( ! $post_id ) {
+			return [];
+		}
 
-		$gate_post_ids   = [];
-		$gates           = Content_Gate::get_gates();
+		$gates = Content_Gate::get_gates();
+		if ( empty( $gates ) ) {
+			return [];
+		}
 
+		$post_gates = [];
 		foreach ( $gates as $gate ) {
-			// TODO: Change this to read from the gate rules.
-			$gate_post_types = \get_post_meta( $gate['id'], 'post_types', true );
-			$gate_categories = \wp_get_post_categories( $gate['id'] );
-			$gate_tags       = \wp_get_post_tags( $gate['id'], [ 'fields' => 'ids' ] );
-
-			if ( empty( $gate_post_types ) || ! in_array( $post_type, $gate_post_types, true ) ) {
+			if ( 'publish' !== $gate['status'] ) {
 				continue;
 			}
-			if ( ! empty( $gate_categories ) && empty( array_intersect( $gate_categories, $categories ) ) ) {
+			$content_rules = $gate['content_rules'];
+			if ( empty( $content_rules ) ) {
 				continue;
 			}
-			if ( ! empty( $gate_tags ) && empty( array_intersect( $gate_tags, $tags ) ) ) {
-				continue;
+
+			foreach ( $content_rules as $content_rule ) {
+				if ( $content_rule['slug'] === 'post_types' ) {
+					$post_type = get_post_type( $post_id );
+					if ( ! in_array( $post_type, $content_rule['value'], true ) ) {
+						continue 2;
+					}
+				} else {
+					$taxonomy = get_taxonomy( $content_rule['slug'] );
+					if ( ! $taxonomy ) {
+						continue 2;
+					}
+					$terms = wp_get_post_terms( $post_id, $content_rule['slug'], [ 'fields' => 'ids' ] );
+					if ( ! $terms || is_wp_error( $terms ) ) {
+						continue 2;
+					}
+					if ( empty( array_intersect( $terms, $content_rule['value'] ) ) ) {
+						continue 2;
+					}
+				}
 			}
-			$gate_post_ids[] = $gate['id'];
+			$post_gates[] = $gate;
 		}
-
-		return $gate_post_ids;
+		return $post_gates;
 	}
 
 	/**
@@ -142,23 +165,45 @@ public static function is_post_restricted( $is_post_restricted, $post_id = null
 			return $is_post_restricted;
 		}
 
-		$gate_ids = self::get_post_gates( $post_id );
-		if ( empty( $gate_ids ) ) {
+		$post_gates = self::get_post_gates( $post_id );
+		if ( empty( $post_gates ) ) {
 			return false;
 		}
 
-		foreach ( $gate_ids as $gate_id ) {
-			$access_rules = Access_Rules::get_post_access_rules( $gate_id );
+		// Return if the post gate has already been determined.
+		if ( ! empty( self::$post_gate_id_map[ $post_id ] ) ) {
+			return true;
+		}
+
+		foreach ( $post_gates as $gate ) {
+			$access_rules = $gate['access_rules'];
 			if ( empty( $access_rules ) ) {
 				continue;
 			}
 			foreach ( $access_rules as $rule ) {
 				if ( ! Access_Rules::evaluate_rule( $rule['slug'], $rule['value'] ?? null ) ) {
-					return false;
+					self::$post_gate_id_map[ $post_id ] = $gate['id'];
+					return true;
 				}
 			}
 		}
-		return true;
+		return false;
+	}
+
+	/**
+	 * Get the current gate post ID.
+	 *
+	 * @param int $gate_post_id Gate post ID.
+	 * @param int $post_id      Post ID. If not given, uses the current post ID.
+	 *
+	 * @return int|false
+	 */
+	public static function get_gate_post_id( $gate_post_id, $post_id = null ) {
+		$post_id = $post_id ?? \get_the_ID();
+		if ( ! empty( self::$post_gate_id_map[ $post_id ] ) ) {
+			return self::$post_gate_id_map[ $post_id ];
+		}
+		return $gate_post_id;
 	}
 }
 Content_Restriction_Control::init();

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

@@ -40,7 +40,7 @@ class Content_Gifting {
 	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_restrict_post', [ __CLASS__, 'restrict_post' ], 10, 2 );
 		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' ] );

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

@@ -232,8 +232,7 @@ public function register_api_endpoints() {
 	 */
 	public function sanitize_gate( $gate ) {
 		return [
-			'title'         => sanitize_text_field( $gate['title'] ),
-			'description'   => sanitize_text_field( $gate['description'] ),
+			'title'         => isset( $gate['title'] ) ? sanitize_text_field( $gate['title'] ) : __( 'Untitled Content Gate', 'newspack-plugin' ),
 			'metering'      => $this->sanitize_metering( $gate['metering'] ),
 			'access_rules'  => $this->sanitize_rules( $gate['access_rules'] ),
 			'content_rules' => $this->sanitize_rules( $gate['content_rules'], 'content' ),
@@ -249,6 +248,15 @@ public function sanitize_gate( $gate ) {
 	 * @return array The sanitized metering.
 	 */
 	public function sanitize_metering( $metering ) {
+		$metering = wp_parse_args(
+			$metering,
+			[
+				'enabled'          => false,
+				'anonymous_count'  => 0,
+				'registered_count' => 0,
+				'period'           => 'month',
+			]
+		);
 		return [
 			'enabled'          => boolval( $metering['enabled'] ),
 			'anonymous_count'  => intval( $metering['anonymous_count'] ),
@@ -267,6 +275,9 @@ public function sanitize_metering( $metering ) {
 	 */
 	public function sanitize_rules( $rules, $type = 'access' ) {
 		$sanitized_rules = [];
+		if ( ! is_array( $rules ) ) {
+			return $sanitized_rules;
+		}
 		foreach ( $rules as $rule ) {
 			$sanitized = $type === 'access' ? $this->sanitize_access_rule( $rule ) : $this->sanitize_content_rule( $rule );
 			if ( ! is_wp_error( $sanitized ) ) {
@@ -299,7 +310,16 @@ public function sanitize_access_rule( $access_rule ) {
 			if ( ! is_array( $access_rule['value'] ) ) {
 				return new \WP_Error( 'invalid_access_rule_value', __( 'Invalid access rule value.', 'newspack-plugin' ), [ 'status' => 400 ] );
 			}
-			$value = array_values( array_filter( array_map( 'sanitize_text_field', $access_rule['value'] ) ) );
+			$value = array_values(
+				array_filter(
+					array_map(
+						function( $value ) {
+							return is_numeric( $value ) ? intval( $value ) : sanitize_text_field( $value );
+						},
+						$access_rule['value']
+					)
+				)
+			);
 		} else {
 			$value = sanitize_text_field( $access_rule['value'] );
 		}

src/wizards/audience/views/content-gates/access-rule-control.tsx

@@ -1,7 +1,12 @@
 /**
  * WordPress dependencies.
  */
-import { CheckboxControl, SelectControl, TextControl } from '@wordpress/components';
+import { CheckboxControl, TextControl } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import { FormTokenField } from '../../../../../packages/components/src';
 
 const noop = () => {};
 
@@ -16,12 +21,12 @@ export default function AccessRuleControl( { slug, value, onChange }: GateAccess
 	}
 	if ( rule.options && rule.options.length > 0 ) {
 		return (
-			<SelectControl
+			<FormTokenField
 				label={ rule.name }
-				value={ value as string }
-				onChange={ onChange }
-				options={ rule.options.map( option => ( { value: option.value, label: option.label } ) ) }
-				help={ rule.description }
+				value={ rule.options.filter( o => value.includes( o.value ) ).map( o => o.label ) }
+				onChange={ ( items: string[] ) => onChange( rule.options?.filter( o => items.includes( o.label ) ).map( o => o.value ) ?? [] ) }
+				suggestions={ rule.options.map( o => o.label ) }
+				__experimentalExpandOnFocus={ true }
 			/>
 		);
 	}