Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Distribution: Warn about unlaunched sites and sites hidden from search engines.
10 changes: 10 additions & 0 deletions projects/packages/podcast/src/class-admin-page.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Automattic\Jetpack\Admin_UI\Admin_Menu;
use Automattic\Jetpack\Connection\Manager as Connection_Manager;
use Automattic\Jetpack\My_Jetpack\Products as My_Jetpack_Products;
use Automattic\Jetpack\Status;
use Automattic\Jetpack\Status\Host;
use Automattic\Jetpack\WP_Build_Polyfills\WP_Build_Polyfills;
use Automattic\Jetpack\WP_Build_Polyfills\WP_Build_Screen_Id;
Expand Down Expand Up @@ -211,9 +212,18 @@ public static function inject_podcast_script_data( $data ) {
);
}
}
$status = new Status();
$is_site_public = 1 === (int) get_option( 'blog_public', 1 )
&& 'unlaunched' !== get_option( 'launch-status' )
&& ! $status->is_private_site()
Comment on lines +216 to +218
&& ! $status->is_coming_soon()
// @phan-suppress-next-line PhanUndeclaredFunction -- Guarded helper provided by the optional wpcomsh plugin.
&& ( ! function_exists( '\\Private_Site\\site_is_private' ) || ! \Private_Site\site_is_private() );

$data['podcast'] = array(
'has_product_access' => Podcast_Gate::has_product_access(),
'is_connected' => $is_wpcom || ( new Connection_Manager( 'jetpack' ) )->is_connected(),
'is_site_public' => $is_site_public,
'show_url_hosts' => Settings::SHOW_URL_HOSTS,
'show_url_max_length' => Settings::SHOW_URL_MAX_LENGTH,
'feed_limit_max' => Settings::feed_limit_max(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ declare module '@automattic/jetpack-script-data' {
podcast?: {
has_product_access?: boolean;
is_connected?: boolean;
is_site_public?: boolean;
show_url_hosts?: Record< string, readonly string[] >;
show_url_max_length?: number;
feed_limit_max?: number;
Expand Down
15 changes: 15 additions & 0 deletions projects/packages/podcast/src/dashboard/distribution/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import jetpackAnalytics from '@automattic/jetpack-analytics';
import { getScriptData, getSiteData } from '@automattic/jetpack-script-data';
import {
Button,
Card,
Expand Down Expand Up @@ -156,6 +157,20 @@ const DistributionTab = ( { onEditSettings }: DistributionTabProps ) => {

return (
<>
{ getScriptData()?.podcast?.is_site_public === false && (
<Notice status="warning" isDismissible={ false } className="podcast__distribution-notice">
{ __(
'Your site is unlaunched, private, or hidden from search engines. Check your site visibility before submitting your feed to podcast directories.',
'jetpack-podcast'
) }{ ' ' }
<Button
variant="link"
href={ `${ getSiteData()?.admin_url ?? '/wp-admin/' }options-reading.php` }
>
{ __( 'Edit site visibility', 'jetpack-podcast' ) }
</Button>
</Notice>
) }
{ issues.length > 0 && (
<Notice status="warning" isDismissible={ false } className="podcast__distribution-notice">
<strong>{ setupStepsLeftLabel }</strong>
Expand Down
64 changes: 64 additions & 0 deletions projects/packages/podcast/tests/php/Admin_Page_Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
use Automattic\Jetpack\Podcast\Admin_Page;
use Automattic\Jetpack\Podcast\Podcast_Gate;
use Automattic\Jetpack\Podcast\Settings;
use Automattic\Jetpack\Status\Cache as Status_Cache;
use Jetpack_Options;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\DataProvider;
use WorDBless\BaseTestCase;
use WorDBless\Options as WorDBless_Options;

Expand Down Expand Up @@ -145,6 +147,68 @@ public function test_inject_script_data_includes_preload_map() {
$this->assertIsArray( $data['podcast']['preload'] );
}

/**
* @param array $options Site visibility options.
* @param string|null $filter Status filter to force true.
* @param bool $expected Expected public visibility.
* @dataProvider provide_site_visibility_states
*/
#[DataProvider( 'provide_site_visibility_states' )]
public function test_inject_script_data_reports_site_visibility( $options, $filter, $expected ) {
Status_Cache::clear();
foreach ( $options as $name => $value ) {
update_option( $name, $value );
}
if ( null !== $filter ) {
add_filter( $filter, '__return_true' );
}

try {
$data = Admin_Page::inject_podcast_script_data( array() );
$this->assertSame( $expected, $data['podcast']['is_site_public'] ?? null );
} finally {
if ( null !== $filter ) {
remove_filter( $filter, '__return_true' );
}
Status_Cache::clear();
}
}

public static function provide_site_visibility_states(): array {
return array(
'public without launch status' => array( array( 'blog_public' => '1' ), null, true ),
'public and launched' => array(
array(
'blog_public' => '1',
'launch-status' => 'launched',
),
null,
true,
),
'discouraged string' => array( array( 'blog_public' => '0' ), null, false ),
'discouraged integer' => array( array( 'blog_public' => 0 ), null, false ),
'private' => array( array( 'blog_public' => '-1' ), null, false ),
'unlaunched' => array(
array(
'blog_public' => '1',
'launch-status' => 'unlaunched',
),
null,
false,
),
'coming soon option' => array(
array(
'blog_public' => '1',
'wpcom_public_coming_soon' => 1,
),
null,
false,
),
'private status filter' => array( array( 'blog_public' => '1' ), 'jetpack_is_private_site', false ),
'coming soon status filter' => array( array( 'blog_public' => '1' ), 'jetpack_is_coming_soon', false ),
);
}

/**
* WPCOM (Simple/Atomic): the injected upsell points at Premium + WordPress.com checkout.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: bugfix

Podcast: Warn about unlaunched sites and sites hidden from search engines.
Loading