← All changes | extensions/blocks/subscriptions/class-jetpack-subscription-site.php +203 -44 13.2.4 → 16.3-a.5 View file →

		@@ -8,8 +8,10 @@
8	8
9	9	namespace Automattic\Jetpack\Extensions\Subscriptions;
10	10
11	11	use Jetpack_Memberships;
	12	+use WP_Block_Template;
	13	+use WP_Post;
12	14
13	15	/**
14	16	* Jetpack_Subscription_Site class.
15	17	*/
		@@ -37,45 +39,153 @@
37	39	*
38	40	* @return void
39	41	*/
40	42	public function handle_subscribe_block_placements() {
41		- if ( ! $this->is_subscription_site_feature_enabled() ) {
42		- return;
	43	+ $this->handle_subscribe_block_post_end_placement();
	44	+ $this->handle_subscribe_block_navigation_placement();
	45	+ }
	46	+
	47	+ /**
	48	+ * Returns true if current user can view the post.
	49	+ *
	50	+ * @return bool
	51	+ */
	52	+ protected function user_can_view_post() {
	53	+ if ( ! class_exists( 'Jetpack_Memberships' ) ) {
	54	+ return true;
43	55	}
44	56
45		- $this->handle_subscribe_block_post_end_placement();
	57	+ return Jetpack_Memberships::user_can_view_post();
46	58	}
47	59
48	60	/**
49		- * Returns true if Subscription Site feature is enabled.
	61	+ * Returns post end placement hooked block attributes.
50	62	*
	63	+ * @param array $default_attrs Deafult attributes.
	64	+ * @param array $anchor_block The anchor block, in parsed block array format.
	65	+ *
	66	+ * @return array
	67	+ */
	68	+ protected function get_post_end_placement_block_attributes( $default_attrs, $anchor_block ) {
	69	+ if ( ! empty( $anchor_block['attrs']['layout']['type'] ) ) {
	70	+ return array_merge(
	71	+ $default_attrs,
	72	+ array(
	73	+ 'layout' => array(
	74	+ 'type' => $anchor_block['attrs']['layout']['type'],
	75	+ ),
	76	+ )
	77	+ );
	78	+ }
	79	+
	80	+ if ( ! empty( $anchor_block['attrs']['layout']['inherit'] ) ) {
	81	+ return array_merge(
	82	+ $default_attrs,
	83	+ array(
	84	+ 'layout' => array(
	85	+ 'inherit' => $anchor_block['attrs']['layout']['inherit'],
	86	+ ),
	87	+ )
	88	+ );
	89	+ }
	90	+
	91	+ return $default_attrs;
	92	+ }
	93	+
	94	+ /**
	95	+ * Returns true if context is recognized as a header element.
	96	+ *
	97	+ * @param WP_Block_Template|WP_Post|array $context The block template, template part, or pattern the anchor block belongs to.
	98	+ *
51	99	* @return bool
52	100	*/
53		- protected function is_subscription_site_feature_enabled() {
54		- // It's temporary. Allows to enable the Subscription Site feature.
55		- $subscription_site_enabled = (bool) apply_filters( 'jetpack_subscription_site_enabled', false );
	101	+ protected function is_header_context( $context ) {
	102	+ if ( $context instanceof WP_Post && $context->post_type === 'wp_navigation' ) {
	103	+ return true;
	104	+ }
56	105
57		- global $wp_version;
58		- return $subscription_site_enabled && version_compare( $wp_version, '6.5-beta2', '>=' );
	106	+ if ( $context instanceof WP_Block_Template && $context->area === 'header' ) {
	107	+ return true;
	108	+ }
	109	+
	110	+ return false;
59	111	}
60	112
61	113	/**
62		- * Returns true if current user can view the post.
	114	+ * Returns true if context is recognized as a single post element.
63	115	*
	116	+ * @param WP_Block_Template|WP_Post|array $context The block template, template part, or pattern the anchor block belongs to.
	117	+ *
64	118	* @return bool
65	119	*/
66		- protected function user_can_view_post() {
67		- if ( ! class_exists( 'Jetpack_Memberships' ) ) {
68		- return true;
	120	+ protected function is_single_post_context( $context ) {
	121	+ /**
	122	+ * Some themes are not returning a WP_Block_Template. In that case, we need to check with is_singular function.
	123	+ */
	124	+ if ( is_array( $context ) ) {
	125	+ return is_singular( 'post' );
69	126	}
70	127
71		- return Jetpack_Memberships::user_can_view_post();
	128	+ return $context instanceof WP_Block_Template && $context->slug === 'single';
72	129	}
73	130
74	131	/**
	132	+ * Handles Subscription block navigation placement.
	133	+ *
	134	+ * @return void
	135	+ */
	136	+ protected function handle_subscribe_block_navigation_placement() {
	137	+ $is_enabled = get_option( 'jetpack_subscriptions_subscribe_navigation_enabled', false );
	138	+ if ( ! $is_enabled ) {
	139	+ return;
	140	+ }
	141	+
	142	+ if ( ! wp_is_block_theme() ) { // TODO Fallback for classic themes.
	143	+ return;
	144	+ }
	145	+
	146	+ add_filter(
	147	+ 'hooked_block_types',
	148	+ function ( $hooked_blocks, $relative_position, $anchor_block, $context ) {
	149	+ if (
	150	+ $anchor_block === 'core/navigation' &&
	151	+ $relative_position === 'last_child' &&
	152	+ self::is_header_context( $context )
	153	+ ) {
	154	+ $hooked_blocks[] = 'jetpack/subscriptions';
	155	+ }
	156	+
	157	+ return $hooked_blocks;
	158	+ },
	159	+ 10,
	160	+ 4
	161	+ );
	162	+
	163	+ add_filter(
	164	+ 'hooked_block_jetpack/subscriptions',
	165	+ function ( $hooked_block, $hooked_block_type, $relative_position, $anchor_block ) {
	166	+ $is_navigation_anchor_block = isset( $anchor_block['blockName'] ) && $anchor_block['blockName'] === 'core/navigation';
	167	+
	168	+ if ( $is_navigation_anchor_block ) {
	169	+ $class_name = ( ! empty( $hooked_block['attrs'] ) && ! empty( $hooked_block['attrs']['className'] ) )
	170	+ ? $hooked_block['attrs']['className'] . ' is-style-button'
	171	+ : 'is-style-button';
	172	+
	173	+ $hooked_block['attrs']['className'] = $class_name;
	174	+ $hooked_block['attrs']['appSource'] = 'subscribe-block-navigation';
	175	+ }
	176	+
	177	+ return $hooked_block;
	178	+ },
	179	+ 10,
	180	+ 4
	181	+ );
	182	+ }
	183	+
	184	+ /**
75	185	* Handles Subscribe block placement at the end of each post.
76	186	*
77		- * @return viod
	187	+ * @return void
78	188	*/
79	189	protected function handle_subscribe_block_post_end_placement() {
80	190	$subscribe_post_end_enabled = get_option( 'jetpack_subscriptions_subscribe_post_end_enabled', false );
81	191	if ( ! $subscribe_post_end_enabled ) {
		@@ -87,29 +197,47 @@
87	197	'the_content',
88	198	function ( $content ) {
89	199	// Check if we're inside the main loop in a single Post.
90	200	if (
91		- is_singular() &&
	201	+ is_single() &&
92	202	in_the_loop() &&
93	203	is_main_query() &&
94	204	$this->user_can_view_post()
95	205	) {
96		- return $content . '
97		- <!-- wp:group {"className":"wp-block-jetpack-subscriptions__subscribe_post_end","layout":{"type":"flex","orientation":"vertical","justifyContent":"stretch"}} -->
98		- <div class="wp-block-group wp-block-jetpack-subscriptions__subscribe_post_end">
99		- <!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"300"}},"className":"has-text-align-center"} -->
100		- <p class="has-text-align-center" style="font-style:normal;font-weight:300">
101		- <em>Aliquam a ullamcorper lorem<br>Integer at tempus nibh</em>
102		- </p>
103		- <!-- /wp:paragraph -->
104		- <!-- wp:jetpack/subscriptions /-->
	206	+ // translators: %s is the name of the site.
	207	+ $discover_more_from_text = sprintf( __( 'Discover more from %s', 'jetpack' ), get_bloginfo( 'name' ) );
	208	+ $subscribe_text = __( 'Subscribe to get the latest posts sent to your email.', 'jetpack' );
	209	+
	210	+ return $content . do_blocks(
	211	+ <<<HTML
	212	+<!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","bottom":"0px","left":"0px","right":"0px"},"margin":{"top":"32px","bottom":"32px"}},"border":{"width":"0px","style":"none"}},"className":"has-border-color","layout":{"type":"default"}} -->
	213	+<div class="wp-block-group has-border-color" style="border-style:none;border-width:0px;margin-top:32px;margin-bottom:32px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px">
	214	+ <!-- wp:separator {"style":{"spacing":{"margin":{"bottom":"24px"}}},"className":"is-style-wide"} -->
	215	+ <hr class="wp-block-separator has-alpha-channel-opacity is-style-wide" style="margin-bottom:24px"/>
	216	+ <!-- /wp:separator -->
	217	+
	218	+ <!-- wp:heading {"textAlign":"center","level":3,"style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"margin":{"top":"4px","bottom":"10px"}}}} -->
	219	+ <h3 class="wp-block-heading has-text-align-center" style="margin-top:4px;margin-bottom:10px">$discover_more_from_text</h3>
	220	+ <!-- /wp:heading -->
	221	+
	222	+ <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"15px"},"spacing":{"margin":{"top":"10px","bottom":"10px"}}}} -->
	223	+ <p class="has-text-align-center" style="margin-top:10px;margin-bottom:10px;font-size:15px">$subscribe_text</p>
	224	+ <!-- /wp:paragraph -->
	225	+
	226	+ <!-- wp:group {"layout":{"type":"constrained","contentSize":"480px"}} -->
	227	+ <div class="wp-block-group">
	228	+ <!-- wp:jetpack/subscriptions {"appSource":"subscribe-block-post-end"} /-->
105	229	</div>
106		- <!-- /wp:group -->';
	230	+ <!-- /wp:group -->
	231	+</div>
	232	+<!-- /wp:group -->
	233	+HTML
	234	+ );
107	235	}
108	236
109	237	return $content;
110	238	},
111		- 8, // TODO use 10 and do_blocks instead?
	239	+ 100, // To insert it after the sharing blocks.
112	240	1
113	241	);
114	242
115	243	return;
		@@ -116,12 +244,13 @@
116	244	}
117	245
118	246	add_filter(
119	247	'hooked_block_types',
120		- function ( $hooked_blocks, $relative_position, $anchor_block ) {
	248	+ function ( $hooked_blocks, $relative_position, $anchor_block, $context ) {
121	249	if (
122	250	$anchor_block === 'core/post-content' &&
123	251	$relative_position === 'after' &&
	252	+ self::is_single_post_context( $context ) &&
124	253	$this->user_can_view_post()
125	254	) {
126	255	$hooked_blocks[] = 'jetpack/subscriptions';
127	256	}
		@@ -128,9 +257,9 @@
128	257
129	258	return $hooked_blocks;
130	259	},
131	260	10,
132		- 3
	261	+ 4
133	262	);
134	263
135	264	add_filter(
136	265	'hooked_block_jetpack/subscriptions',
		@@ -136,32 +265,62 @@
136	265	'hooked_block_jetpack/subscriptions',
137	266	function ( $hooked_block, $hooked_block_type, $relative_position, $anchor_block ) {
138	267	$is_post_content_anchor_block = isset( $anchor_block['blockName'] ) && $anchor_block['blockName'] === 'core/post-content';
139	268	if ( $is_post_content_anchor_block && ( $relative_position === 'after' || $relative_position === 'before' ) ) {
140		- $attrs = array(
141		- 'layout' => array(
142		- 'type' => 'flex',
143		- 'orientation' => 'vertical',
144		- 'justifyContent' => 'stretch',
	269	+ $attrs = $this->get_post_end_placement_block_attributes(
	270	+ array(
	271	+ 'style' => array(
	272	+ 'spacing' => array(
	273	+ 'margin' => array(
	274	+ 'top' => '48px',
	275	+ 'bottom' => '48px',
	276	+ ),
	277	+ 'padding' => array(
	278	+ 'top' => '5px',
	279	+ 'bottom' => '5px',
	280	+ ),
	281	+ ),
	282	+ ),
145	283	),
	284	+ $anchor_block
146	285	);
147		- if ( ! empty( $anchor_block['attrs']['layout']['type'] ) ) {
148		- $attrs['layout']['type'] = $anchor_block['attrs']['layout']['type'];
149		- }
150	286
	287	+ // translators: %s is the name of the site.
	288	+ $discover_more_from_text = sprintf( __( 'Discover more from %s', 'jetpack' ), get_bloginfo( 'name' ) );
	289	+ $subscribe_text = __( 'Subscribe to get the latest posts sent to your email.', 'jetpack' );
	290	+ $inner_content_begin = <<<HTML
	291	+<div class="wp-block-group" style="margin-top:48px;margin-bottom:48px;padding-top:5px;padding-bottom:5px">
	292	+ <!-- wp:separator {"style":{"spacing":{"margin":{"bottom":"36px"}}},"className":"is-style-wide"} -->
	293	+ <hr class="wp-block-separator has-alpha-channel-opacity is-style-wide" style="margin-bottom:36px"/>
	294	+ <!-- /wp:separator -->
	295	+
	296	+ <!-- wp:heading {"textAlign":"center","level":3,"style":{"layout":{"selfStretch":"fit","flexSize":null},"spacing":{"margin":{"top":"4px","bottom":"10px"}}}} -->
	297	+ <h3 class="wp-block-heading has-text-align-center" style="margin-top:4px;margin-bottom:10px">$discover_more_from_text</h3>
	298	+ <!-- /wp:heading -->
	299	+
	300	+ <!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"15px"},"spacing":{"margin":{"top":"4px","bottom":"0px"}}}} -->
	301	+ <p class="has-text-align-center" style="margin-top:4px;margin-bottom:0px;font-size:15px">$subscribe_text</p>
	302	+ <!-- /wp:paragraph -->
	303	+
	304	+ <!-- wp:group {"layout":{"type":"constrained","contentSize":"480px"}} -->
	305	+ <div class="wp-block-group">
	306	+HTML;
	307	+ $inner_content_end = <<<'HTML'
	308	+ </div>
	309	+ <!-- /wp:group -->
	310	+</div>
	311	+HTML;
	312	+
	313	+ $hooked_block['attrs']['appSource'] = 'subscribe-block-post-end';
	314	+
151	315	return array(
152	316	'blockName' => 'core/group',
153	317	'attrs' => $attrs,
154	318	'innerBlocks' => array( $hooked_block ),
155	319	'innerContent' => array(
156		- '<div class="wp-block-group">
157		- <!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"300"}},"className":"has-text-align-center"} -->
158		- <p class="has-text-align-center" style="font-style:normal;font-weight:300">
159		- <em>Aliquam a ullamcorper lorem<br>Integer at tempus nibh</em>
160		- </p>
161		- <!-- /wp:paragraph -->',
	320	+ $inner_content_begin,
162	321	null,
163		- '</div>',
	322	+ $inner_content_end,
164	323	),
165	324	);
166	325	}
167	326