Automattic · jeherve · Jan 11, 2023 · Jan 6, 2023 · Jan 6, 2023 · Jan 10, 2023
diff --git a/projects/packages/connection/changelog/add-shared-get-blog-id b/projects/packages/connection/changelog/add-shared-get-blog-id
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add new method to get a connected site's blog ID.
diff --git a/projects/packages/connection/composer.json b/projects/packages/connection/composer.json
@@ -65,7 +65,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "1.48.x-dev"
+			"dev-trunk": "1.49.x-dev"
 		}
 	},
 	"config": {

diff --git a/projects/packages/connection/src/class-manager.php b/projects/packages/connection/src/class-manager.php
@@ -2488,4 +2488,22 @@ public function add_stats_to_heartbeat( $stats ) {
 		}
 		return $stats;
 	}
+
+	/**
+	 * Get the WPCOM or self-hosted site ID.
+	 *
+	 * @return int|WP_Error
+	 */
+	public static function get_site_id() {
+		$is_wpcom = ( defined( 'IS_WPCOM' ) && IS_WPCOM );
+		$site_id  = $is_wpcom ? get_current_blog_id() : \Jetpack_Options::get_option( 'id' );
+		if ( ! $site_id ) {
+			return new \WP_Error(
+				'unavailable_site_id',
+				__( 'Sorry, something is wrong with your Jetpack connection.', 'jetpack-connection' ),
+				403
+			);
+		}
+		return (int) $site_id;
+	}
 }
diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '1.48.2-alpha';
+	const PACKAGE_VERSION = '1.49.0-alpha';
 
 	const PACKAGE_SLUG = 'connection';
 

diff --git a/projects/packages/connection/src/class-utils.php b/projects/packages/connection/src/class-utils.php
@@ -83,5 +83,4 @@ public static function filter_register_request_body( $properties ) {
 			)
 		);
 	}
-
 }
diff --git a/projects/plugins/backup/changelog/add-shared-get-blog-id b/projects/plugins/backup/changelog/add-shared-get-blog-id
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
diff --git a/projects/plugins/boost/changelog/add-shared-get-blog-id b/projects/plugins/boost/changelog/add-shared-get-blog-id
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
diff --git a/projects/plugins/jetpack/_inc/lib/class-jetpack-google-drive-helper.php b/projects/plugins/jetpack/_inc/lib/class-jetpack-google-drive-helper.php
@@ -6,6 +6,7 @@
  */
 
 use Automattic\Jetpack\Connection\Client;
+use Automattic\Jetpack\Connection\Manager;
 use Automattic\Jetpack\Status\Visitor;
 
 /**
@@ -19,7 +20,7 @@ class Jetpack_Google_Drive_Helper {
 	 * @return array       Array with single 'valid' (bool) entry.
 	 */
 	public static function has_valid_connection( $user_id ) {
-		$site_id = self::get_site_id();
+		$site_id = Manager::get_site_id();
 		if ( is_wp_error( $site_id ) ) {
 			return false;
 		}
@@ -68,7 +69,7 @@ public static function has_valid_connection( $user_id ) {
 	 * @return array
 	 */
 	public static function create_sheet( $user_id, $title, $rows = array() ) {
-		$site_id = self::get_site_id();
+		$site_id = Manager::get_site_id();
 		if ( is_wp_error( $site_id ) ) {
 			return false;
 		}
@@ -122,22 +123,4 @@ public static function create_sheet( $user_id, $title, $rows = array() ) {
 		}
 		return json_decode( wp_remote_retrieve_body( $wpcom_request ), true );
 	}
-
-	/**
-	 * Get the WPCOM or self-hosted site ID.
-	 *
-	 * @return mixed
-	 */
-	public static function get_site_id() {
-		$is_wpcom = ( defined( 'IS_WPCOM' ) && IS_WPCOM );
-		$site_id  = $is_wpcom ? get_current_blog_id() : Jetpack_Options::get_option( 'id' );
-		if ( ! $site_id ) {
-			return new WP_Error(
-				'unavailable_site_id',
-				__( 'Sorry, something is wrong with your Jetpack connection.', 'jetpack' ),
-				403
-			);
-		}
-		return (int) $site_id;
-	}
 }
diff --git a/projects/plugins/jetpack/_inc/lib/class-jetpack-instagram-gallery-helper.php b/projects/plugins/jetpack/_inc/lib/class-jetpack-instagram-gallery-helper.php
@@ -6,6 +6,7 @@
  */
 
 use Automattic\Jetpack\Connection\Client;
+use Automattic\Jetpack\Connection\Manager;
 
 /**
  * Class Jetpack_Instagram_Gallery_Helper
@@ -21,7 +22,7 @@ class Jetpack_Instagram_Gallery_Helper {
 	 * @return bool
 	 */
 	public static function is_instagram_access_token_valid( $access_token_id ) {
-		$site_id = self::get_site_id();
+		$site_id = Manager::get_site_id();
 		if ( is_wp_error( $site_id ) ) {
 			return false;
 		}
@@ -52,7 +53,7 @@ public static function is_instagram_access_token_valid( $access_token_id ) {
 	 * @return mixed
 	 */
 	public static function get_instagram_gallery( $access_token_id, $count ) {
-		$site_id = self::get_site_id();
+		$site_id = Manager::get_site_id();
 		if ( is_wp_error( $site_id ) ) {
 			return $site_id;
 		}
@@ -94,22 +95,4 @@ public static function get_instagram_gallery( $access_token_id, $count ) {
 		set_transient( $transient_key, $gallery, HOUR_IN_SECONDS );
 		return json_decode( $gallery );
 	}
-
-	/**
-	 * Get the WPCOM or self-hosted site ID.
-	 *
-	 * @return mixed
-	 */
-	public static function get_site_id() {
-		$is_wpcom = ( defined( 'IS_WPCOM' ) && IS_WPCOM );
-		$site_id  = $is_wpcom ? get_current_blog_id() : Jetpack_Options::get_option( 'id' );
-		if ( ! $site_id ) {
-			return new WP_Error(
-				'unavailable_site_id',
-				__( 'Sorry, something is wrong with your Jetpack connection.', 'jetpack' ),
-				403
-			);
-		}
-		return (int) $site_id;
-	}
 }
diff --git a/projects/plugins/jetpack/_inc/lib/class-jetpack-tweetstorm-helper.php b/projects/plugins/jetpack/_inc/lib/class-jetpack-tweetstorm-helper.php
@@ -7,6 +7,7 @@
  */
 
 use Automattic\Jetpack\Connection\Client;
+use Automattic\Jetpack\Connection\Manager;
 use Automattic\Jetpack\Status;
 use Twitter\Text\Regex as Twitter_Regex;
 use Twitter\Text\Validator as Twitter_Validator;
@@ -262,7 +263,7 @@ public static function gather( $url ) {
 			);
 		}
 
-		$site_id = self::get_site_id();
+		$site_id = Manager::get_site_id();
 		if ( is_wp_error( $site_id ) ) {
 			return $site_id;
 		}
@@ -1732,22 +1733,4 @@ public static function validate_redirect_url( $redirect_url ) {
 			throw new Requests_Exception( __( 'A valid URL was not provided.', 'jetpack' ), 'wp_http.redirect_failed_validation' );
 		}
 	}
-
-	/**
-	 * Get the WPCOM or self-hosted site ID.
-	 *
-	 * @return mixed
-	 */
-	public static function get_site_id() {
-		$is_wpcom = ( defined( 'IS_WPCOM' ) && IS_WPCOM );
-		$site_id  = $is_wpcom ? get_current_blog_id() : Jetpack_Options::get_option( 'id' );
-		if ( ! $site_id ) {
-			return new WP_Error(
-				'unavailable_site_id',
-				__( 'Sorry, something is wrong with your Jetpack connection.', 'jetpack' ),
-				403
-			);
-		}
-		return (int) $site_id;
-	}
 }
diff --git a/.../_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-instagram-gallery.php b/.../_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-instagram-gallery.php
@@ -7,6 +7,7 @@
  */
 
 use Automattic\Jetpack\Connection\Client;
+use Automattic\Jetpack\Connection\Manager;
 
 /**
  * Instagram connections helper API.
@@ -102,7 +103,7 @@ public function get_instagram_connect_url() {
 			return WPCOM_Instagram_Gallery_Helper::get_connect_url();
 		}
 
-		$site_id = Jetpack_Instagram_Gallery_Helper::get_site_id();
+		$site_id = Manager::get_site_id();
 		if ( is_wp_error( $site_id ) ) {
 			return $site_id;
 		}

diff --git a/projects/plugins/jetpack/changelog/add-shared-get-blog-id b/projects/plugins/jetpack/changelog/add-shared-get-blog-id
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+General: switch to shared method for getting a WordPress.com blog ID.
diff --git a/projects/plugins/jetpack/changelog/add-shared-get-blog-id#2 b/projects/plugins/jetpack/changelog/add-shared-get-blog-id#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
diff --git a/projects/plugins/protect/changelog/add-shared-get-blog-id b/projects/plugins/protect/changelog/add-shared-get-blog-id
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
diff --git a/projects/plugins/search/changelog/add-shared-get-blog-id b/projects/plugins/search/changelog/add-shared-get-blog-id
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
diff --git a/projects/plugins/social/changelog/add-shared-get-blog-id b/projects/plugins/social/changelog/add-shared-get-blog-id
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
diff --git a/projects/plugins/starter-plugin/changelog/add-shared-get-blog-id b/projects/plugins/starter-plugin/changelog/add-shared-get-blog-id
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
diff --git a/projects/plugins/videopress/changelog/add-shared-get-blog-id b/projects/plugins/videopress/changelog/add-shared-get-blog-id
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+