Atomic: Modify /sites/%s endpoint to rely on the privacy model

projects/plugins/jetpack/changelog/update-atomic-site-endpoint-is-private

@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Atomic: Modify `/sites/%s` endpoint to rely on the privacy model, and auto-adjust local 'blog_public' option to match privacy model.

projects/plugins/jetpack/sal/class.json-api-site-jetpack.php

@@ -355,8 +355,19 @@ public function allowed_file_types() {
 	 * Return site's privacy status.
 	 *
 	 * @return bool  Is site private?
+	 * @phan-suppress PhanUndeclaredFunction
 	 */
 	public function is_private() {
+		if ( ! ( new Host() )->is_woa_site() ) {
+			return false;
+		}
+
+		// Making sure wpcomsh plugin is available.
+		if ( function_exists( '\Private_Site\maybe_fix_private_site_option' ) && function_exists( '\Private_Site\site_is_private' ) ) {
+			\Private_Site\maybe_fix_private_site_option();
+			return \Private_Site\site_is_private();
+		}
+
 		return (int) $this->get_atomic_cloud_site_option( 'blog_public' ) === -1;
 	}
 

projects/plugins/wpcomsh/changelog/update-atomic-site-endpoint-is-private

@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Atomic: Auto-adjust 'blog_public' property to match privacy model.

projects/plugins/wpcomsh/private-site/private-site.php

@@ -9,6 +9,7 @@
 namespace Private_Site;
 
 use Automattic\Jetpack\Connection\Rest_Authentication;
+use Automattic\Jetpack\Status\Host;
 use Jetpack;
 use WP_Error;
 use WP_REST_Request;
@@ -260,6 +261,64 @@ function site_is_private() {
 	return defined( 'AT_PRIVACY_MODEL' ) && AT_PRIVACY_MODEL === 'wp_uploads';
 }
 
+/**
+ * Update blog_private option to match the site's actual privacy status.
+ * Sets it to -1 for private sites, 1 for public sites.
+ */
+function maybe_fix_private_site_option() {
+	// Privacy model only applies to WordPress.com Atomic sites.
+	if ( ! ( new Host() )->is_woa_site() ) {
+		return;
+	}
+
+	// Coming soon sites are a special case of public and private sites, so we skip them here.
+	if ( site_is_coming_soon() || site_is_public_coming_soon() ) {
+		return;
+	}
+
+	$is_private    = site_is_private();
+	$current_value = (int) get_option( 'blog_public' );
+
+	// No action needed if site is public and option is already set to 0 (discourage indexing).
+	if ( ! $is_private && $current_value === 0 ) {
+		return;
+	}
+
+	$expected_value = $is_private ? -1 : 1;
+
+	if ( $current_value !== $expected_value ) {
+		update_option( 'blog_public', $expected_value );
+		register_shutdown_function( __NAMESPACE__ . '\private_site_log_option_adjusted', $current_value, $expected_value );
+	}
+}
+
+/**
+ * Save a log entry when the blog_public option is adjusted.
+ *
+ * @param int $current_value Current option value.
+ * @param int $new_value New option value.
+ *
+ * @return void
+ */
+function private_site_log_option_adjusted( $current_value, $new_value ) {
+	$jetpack_options = get_option( 'jetpack_options' );
+	$blog_id         = ( is_array( $jetpack_options ) && ! empty( $jetpack_options['id'] ) ) ? $jetpack_options['id'] : 0;
+
+	$data = wp_json_encode(
+		array(
+			'feature'    => 'atomic_private_site_blog_public_adjusted',
+			'message'    => 'Value of blog_public option adjusted according to the privacy model.',
+			'blog_id'    => $blog_id,
+			'properties' => array(
+				'current_value' => $current_value,
+				'new_value'     => $new_value,
+			),
+		)
+	);
+
+	wp_remote_post( 'https://public-api.wordpress.com/rest/v1.1/logstash', array( 'body' => array( 'params' => $data ) ) );
+}
+
 /**
  * Determine if site access should be blocked for various types of requests.
  * This function is cached for subsequent calls so we can use it gratuitously.