move purge logic into optimizer

Author: mustafauysal

includes/classes/Admin/Dashboard.php

@@ -20,7 +20,6 @@
 use const ImageOptimizerPro\Constants\LICENSE_INFO_TRANSIENT;
 use const ImageOptimizerPro\Constants\LICENSE_KEY_OPTION;
 use const ImageOptimizerPro\Constants\MENU_SLUG;
-use const ImageOptimizerPro\Constants\PURGE_ENDPOINT;
 use const ImageOptimizerPro\Constants\SETTING_OPTION;
 
 /**
@@ -76,7 +75,6 @@ public function setup() {
 		add_action( 'admin_init', [ $this, 'save_settings' ] );
 		add_action( 'admin_init', [ $this, 'maybe_redirect' ] );
 		add_action( 'admin_init', [ $this, 'add_privacy_message' ] );
-		add_action( 'admin_post_image_optimizer_pro_cache_purge', [ $this, 'handle_cache_purge' ] );
 	}
 
 	/**
@@ -382,71 +380,6 @@ public function add_privacy_message() {
 		}
 	}
 
-	/**
-	 * Handle cache purge
-	 *
-	 * @return void
-	 */
-	public function handle_cache_purge() {
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( esc_html__( 'You do not have sufficient permissions to perform this action.', 'image-optimizer-pro' ) );
-		}
-
-		if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_GET['_wpnonce'] ) ), 'image_optimizer_pro_cache_purge' ) ) {
-			wp_die( esc_html__( 'Nonce verification failed.', 'image-optimizer-pro' ) );
-		}
-
-		$response = $this->purge_image_optimizer_cache();
-
-		if ( ! is_wp_error( $response ) && ! empty( $response['success'] ) ) {
-			$redirect_url = add_query_arg( 'iop_action', 'purge_image_optimizer_cache', wp_get_referer() );
-		} else {
-			$redirect_url = add_query_arg( 'iop_action', 'purge_image_optimizer_cache_failed', wp_get_referer() );
-		}
-
-		wp_safe_redirect( esc_url_raw( $redirect_url ) );
-		exit;
-	}
-
-	/**
-	 * Purge Image Optimizer cache
-	 *
-	 * @return mixed|\WP_Error|null
-	 */
-	public function purge_image_optimizer_cache() {
-		if ( is_multisite() ) {
-			return new \WP_Error( 'multisite_not_supported', esc_html__( 'Multisite is not supported for Image Optimizer Purge.', 'image-optimizer-pro' ) );
-		}
-
-		$body = wp_json_encode(
-			[
-				'license_key' => get_license_key(),
-				'license_url' => home_url(),
-			]
-		);
-
-		$response = wp_remote_post(
-			PURGE_ENDPOINT,
-			[
-				'headers' => [
-					'Content-Type' => 'application/json',
-				],
-				'body'    => $body,
-			]
-		);
-
-		if ( is_wp_error( $response ) ) {
-			$error_message = $response->get_error_message();
-
-			return new \WP_Error( 'request_failed', esc_html__( 'Request failed: ', 'image-optimizer-pro' ) . $error_message );
-		}
-
-		$response_body = wp_remote_retrieve_body( $response );
-
-		return json_decode( $response_body, true );
-	}
-
-
 	/**
 	 * Maybe display feedback messages when certain action is taken
 	 *

includes/classes/Optimizer.php

@@ -10,8 +10,10 @@
 use \WP_REST_Request as WP_REST_Request;
 use \WP_Post as WP_Post;
 use \WP_Error as WP_Error;
+use function ImageOptimizerPro\Utils\get_license_key;
 use function ImageOptimizerPro\Utils\is_license_active;
 use function ImageOptimizerPro\Utils\is_local_site;
+use const ImageOptimizerPro\Constants\PURGE_ENDPOINT;
 
 /**
  * Class Optimizer
@@ -119,6 +121,9 @@ private function setup() {
 		// set preferred image format
 		self::$preferred_image_formats = $settings['preferred_format'];
 
+		// purge cache
+		add_action( 'admin_post_image_optimizer_pro_cache_purge', [ $this, 'handle_cache_purge' ] );
+
 		// skip photonized urls when image optimizer active
 		add_filter( 'jetpack_photon_skip_for_url', '__return_true' );
 		add_filter( 'wp_resource_hints', [ $this, 'add_dns_prefetch' ], 10, 2 );
@@ -1707,4 +1712,68 @@ private static function end_buffering( $contents, $phase ) {
 		return $contents;
 	}
 
+	/**
+	 * Handle cache purge
+	 *
+	 * @return void
+	 */
+	public function handle_cache_purge() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			wp_die( esc_html__( 'You do not have sufficient permissions to perform this action.', 'image-optimizer-pro' ) );
+		}
+
+		if ( ! isset( $_GET['_wpnonce'] ) || ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_GET['_wpnonce'] ) ), 'image_optimizer_pro_cache_purge' ) ) {
+			wp_die( esc_html__( 'Nonce verification failed.', 'image-optimizer-pro' ) );
+		}
+
+		$response = $this->purge_image_optimizer_cache();
+
+		if ( ! is_wp_error( $response ) && ! empty( $response['success'] ) ) {
+			$redirect_url = add_query_arg( 'iop_action', 'purge_image_optimizer_cache', wp_get_referer() );
+		} else {
+			$redirect_url = add_query_arg( 'iop_action', 'purge_image_optimizer_cache_failed', wp_get_referer() );
+		}
+
+		wp_safe_redirect( esc_url_raw( $redirect_url ) );
+		exit;
+	}
+
+	/**
+	 * Purge Image Optimizer cache
+	 *
+	 * @return mixed|\WP_Error|null
+	 */
+	public function purge_image_optimizer_cache() {
+		if ( is_multisite() ) {
+			return new \WP_Error( 'multisite_not_supported', esc_html__( 'Multisite is not supported for Image Optimizer Purge.', 'image-optimizer-pro' ) );
+		}
+
+		$body = wp_json_encode(
+			[
+				'license_key' => get_license_key(),
+				'license_url' => home_url(),
+			]
+		);
+
+		$response = wp_remote_post(
+			PURGE_ENDPOINT,
+			[
+				'headers' => [
+					'Content-Type' => 'application/json',
+				],
+				'body'    => $body,
+			]
+		);
+
+		if ( is_wp_error( $response ) ) {
+			$error_message = $response->get_error_message();
+
+			return new \WP_Error( 'request_failed', esc_html__( 'Request failed: ', 'image-optimizer-pro' ) . $error_message );
+		}
+
+		$response_body = wp_remote_retrieve_body( $response );
+
+		return json_decode( $response_body, true );
+	}
+
 }