Updater class update

a8cteam51 · Mar 23, 2024 · a3afb5a · a3afb5a
1 parent 392227d
commit a3afb5a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 75 deletions.
diff --git a/.utilities/class-wpsp-blocks-self-update.php b/.utilities/class-wpsp-blocks-self-update.php
@@ -31,7 +31,7 @@ public static function get_instance() {
 	 * Initialize WordPress hooks
 	 */
 	public function hooks() {
-		add_filter( 'update_plugins_opsoasis.mystagingwebsite.com', array( $this, 'self_update' ), 10, 3 );
+		add_filter( 'update_plugins_opsoasis-develop.mystagingwebsite.com', array( $this, 'self_update' ), 10, 3 );
 	}
 
 	/**
@@ -49,23 +49,11 @@ public function self_update( $update, array $plugin_data, string $plugin_file )
 			return $update;
 		}
 
-		// Check this is a plugin we actually manage.
-		$wpsp_blocks = array_map(
-			function( $block ) {
-				return "{$block}/{$block}.php";
-			},
-			apply_filters( 'wpsp_installed_blocks', array() )
-		);
-
-		if ( ! in_array( $plugin_file, $wpsp_blocks, true ) ) {
-			return $update;
-		}
-
 		$plugin_filename_parts = explode( '/', $plugin_file );
 
 		// Ask opsoasis.mystagingwebsite.com if there's an update.
 		$response = wp_remote_get(
-			'https://opsoasis.mystagingwebsite.com/wp-json/opsoasis-blocks-version-manager/v1/update-check',
+			'https://opsoasis-develop.mystagingwebsite.com/wp-json/opsoasis-blocks-version-manager/v1/update-check',
 			array(
 				'body' => array(
 					'plugin'  => $plugin_filename_parts[0],
@@ -82,20 +70,11 @@ function( $block ) {
 		$updated_version = wp_remote_retrieve_body( $response );
 		$updated_array   = json_decode( $updated_version, true );
 
-		// Get the zip file.
-		$zip = wp_remote_get( $updated_array['package_url'] );
-
-		// If the zip file was found, return the update.
-		if ( 200 === wp_remote_retrieve_response_code( $zip ) ) {
-			return array(
-				'slug'    => $updated_array['slug'],
-				'version' => $updated_array['version'],
-				'url'     => $updated_array['package_url'],
-				'package' => wp_remote_retrieve_body( $zip ),
-			);
-		}
-
-		// If we're here, nothing was found on github.
-		return $update;
+		return array(
+			'slug'    => $updated_array['slug'],
+			'version' => $updated_array['version'],
+			'url'     => $updated_array['package_url'],
+			'package' => $updated_array['package_url'],
+		);
 	}
 }
diff --git a/dynamic-table-of-contents/classes/class-wpsp-blocks-self-update.php b/dynamic-table-of-contents/classes/class-wpsp-blocks-self-update.php
@@ -31,7 +31,7 @@ public static function get_instance() {
 	 * Initialize WordPress hooks
 	 */
 	public function hooks() {
-		add_filter( 'update_plugins_opsoasis.mystagingwebsite.com', array( $this, 'self_update' ), 10, 3 );
+		add_filter( 'update_plugins_opsoasis-develop.mystagingwebsite.com', array( $this, 'self_update' ), 10, 3 );
 	}
 
 	/**
@@ -49,23 +49,11 @@ public function self_update( $update, array $plugin_data, string $plugin_file )
 			return $update;
 		}
 
-		// Check this is a plugin we actually manage.
-		$wpsp_blocks = array_map(
-			function( $block ) {
-				return "{$block}/{$block}.php";
-			},
-			apply_filters( 'wpsp_installed_blocks', array() )
-		);
-
-		if ( ! in_array( $plugin_file, $wpsp_blocks, true ) ) {
-			return $update;
-		}
-
 		$plugin_filename_parts = explode( '/', $plugin_file );
 
 		// Ask opsoasis.mystagingwebsite.com if there's an update.
 		$response = wp_remote_get(
-			'https://opsoasis.mystagingwebsite.com/wp-json/opsoasis-blocks-version-manager/v1/update-check',
+			'https://opsoasis-develop.mystagingwebsite.com/wp-json/opsoasis-blocks-version-manager/v1/update-check',
 			array(
 				'body' => array(
 					'plugin'  => $plugin_filename_parts[0],
@@ -82,20 +70,11 @@ function( $block ) {
 		$updated_version = wp_remote_retrieve_body( $response );
 		$updated_array   = json_decode( $updated_version, true );
 
-		// Get the zip file.
-		$zip = wp_remote_get( $updated_array['package_url'] );
-
-		// If the zip file was found, return the update.
-		if ( 200 === wp_remote_retrieve_response_code( $zip ) ) {
-			return array(
-				'slug'    => $updated_array['slug'],
-				'version' => $updated_array['version'],
-				'url'     => $updated_array['package_url'],
-				'package' => wp_remote_retrieve_body( $zip ),
-			);
-		}
-
-		// If we're here, nothing was found on github.
-		return $update;
+		return array(
+			'slug'    => $updated_array['slug'],
+			'version' => $updated_array['version'],
+			'url'     => $updated_array['package_url'],
+			'package' => $updated_array['package_url'],
+		);
 	}
 }
diff --git a/hello-world/classes/class-wpsp-blocks-self-update.php b/hello-world/classes/class-wpsp-blocks-self-update.php
@@ -31,7 +31,7 @@ public static function get_instance() {
 	 * Initialize WordPress hooks
 	 */
 	public function hooks() {
-		add_filter( 'update_plugins_opsoasis.mystagingwebsite.com', array( $this, 'self_update' ), 10, 3 );
+		add_filter( 'update_plugins_opsoasis-develop.mystagingwebsite.com', array( $this, 'self_update' ), 10, 3 );
 	}
 
 	/**
@@ -53,7 +53,7 @@ public function self_update( $update, array $plugin_data, string $plugin_file )
 
 		// Ask opsoasis.mystagingwebsite.com if there's an update.
 		$response = wp_remote_get(
-			'https://opsoasis.mystagingwebsite.com/wp-json/opsoasis-blocks-version-manager/v1/update-check',
+			'https://opsoasis-develop.mystagingwebsite.com/wp-json/opsoasis-blocks-version-manager/v1/update-check',
 			array(
 				'body' => array(
 					'plugin'  => $plugin_filename_parts[0],
@@ -70,20 +70,11 @@ public function self_update( $update, array $plugin_data, string $plugin_file )
 		$updated_version = wp_remote_retrieve_body( $response );
 		$updated_array   = json_decode( $updated_version, true );
 
-		// Get the zip file.
-		$zip = wp_remote_get( $updated_array['package_url'] );
-
-		// If the zip file was found, return the update.
-		if ( 200 === wp_remote_retrieve_response_code( $zip ) ) {
-			return array(
-				'slug'    => $updated_array['slug'],
-				'version' => $updated_array['version'],
-				'url'     => $updated_array['package_url'],
-				'package' => wp_remote_retrieve_body( $zip ),
-			);
-		}
-
-		// If we're here, nothing was found on github.
-		return $update;
+		return array(
+			'slug'    => $updated_array['slug'],
+			'version' => $updated_array['version'],
+			'url'     => $updated_array['package_url'],
+			'package' => $updated_array['package_url'],
+		);
 	}
 }