Fixed: show CE notice when $self_hosted_domain is set, otherwise show Cloud notice.

Author: Dan0sz

src/Admin/Upgrades.php

@@ -94,10 +94,6 @@ public function run() {
 			$this->upgrade_to_251();
 		}
 
-		if ( version_compare( $plausible_analytics_version, '2.5.3', '<' ) ) {
-			$this->upgrade_to_253();
-		}
-
 		if ( version_compare( $plausible_analytics_version, '2.5.4', '<' ) ) {
 			$this->upgrade_to_254();
 		}
@@ -356,41 +352,29 @@ public function upgrade_to_251() {
 	}
 
 	/**
-	 * Show an admin-wide notice to CE users that haven't entered an API token yet.
+	 * Show an admin-wide notice to CE or Cloud users that haven't entered an API token yet.
 	 *
 	 * @return void
 	 */
-	public function upgrade_to_253() {
+	public function upgrade_to_254() {
 		$self_hosted_domain = Helpers::get_settings()['self_hosted_domain'];
 		$api_token          = Helpers::get_settings()['api_token'];
 
-		// Not a CE user or a CE user already using the Plugins API.
-		if ( empty( $self_hosted_domain ) || ! empty( $api_token ) ) {
-			update_option( 'plausible_analytics_version', '2.5.3' );
+		// API token already entered, no notice needed.
+		if ( ! empty( $api_token ) ) {
+			update_option( 'plausible_analytics_version', '2.5.4' );
 
 			return;
 		}
 
-		add_action( 'admin_notices', [ $this, 'show_ce_api_token_notice' ] );
-	}
-
-	/**
-	 * Show an admin-wide notice to Cloud users that haven't entered an API token yet.
-	 *
-	 * @return void
-	 */
-	public function upgrade_to_254() {
-		$self_hosted_domain = Helpers::get_settings()['self_hosted_domain'];
-		$api_token          = Helpers::get_settings()['api_token'];
-
-		// This user apparently hasn't entered an API token yet.
-		if ( empty( $api_token ) && empty ( $self_hosted_domain ) ) {
-			update_option( 'plausible_analytics_version', '2.5.4' );
+		// Show CE notice if self-hosted domain is set, otherwise show Cloud notice.
+		if ( ! empty( $self_hosted_domain ) ) {
+			add_action( 'admin_notices', [ $this, 'show_ce_api_token_notice' ] );
 
 			return;
 		}
 
-		add_action( 'admin_notices', [ $this, 'show_api_token_notice' ] );
+		add_action( 'admin_notices', [ $this, 'show_cloud_api_token_notice' ] );
 	}
 
 	/**
@@ -409,11 +393,11 @@ public function show_ce_api_token_notice() {
 	}
 
 	/**
-	 * Display a notice to CE users that haven't entered an API token yet.
+	 * Display a notice to Cloud users that haven't entered an API token yet.
 	 *
 	 * @return void
 	 */
-	public function show_api_token_notice() {
+	public function show_cloud_api_token_notice() {
 		$url = admin_url( 'options-general.php?page=plausible_analytics' );
 
 		?>