Merge pull request #32 from rankmath/v1.1.17

Fix PHP notice

Author: pratikrm

includes/class-instant-indexing.php

@@ -15,7 +15,7 @@ class RM_GIAPI {
 	 *
 	 * @var string
 	 */
-	public $version = '1.1.16';
+	public $version = '1.1.17';
 
 	/**
 	 * Holds the admin menu hook suffix for the "dummy" dashboard.
@@ -87,6 +87,20 @@ class RM_GIAPI {
 	 */
 	public $rmapi = null;
 
+	/**
+	 * Rank Math Instant Indexing module instance.
+	 *
+	 * @var object
+	 */
+	public $rm_module = null;
+
+	/**
+	 * Holds the Google API client.
+	 *
+	 * @var object
+	 */
+	public $client = null;
+
 	/**
 	 * URL of the Google plugin setup guide on rankmath.com.
 	 *
@@ -101,6 +115,11 @@ class RM_GIAPI {
 	 */
 	public $bing_guide_url = 'https://rankmath.com/blog/bing-indexing-api/?utm_source=Instant+Indexing+Plugin&utm_medium=Setup+Guide+Button&utm_campaign=WP';
 
+	/**
+	 * Restrict to one request every X seconds to a given URL.
+	 */
+	const THROTTLE_LIMIT = 5;
+
 	/**
 	 * Constructor method.
 	 */
@@ -127,7 +146,7 @@ public function __construct() {
 
 		if ( $this->is_rm_active && class_exists( 'RankMath\\Instant_Indexing\\Api' ) ) {
 			$this->rm_module = new RankMath\Instant_Indexing\Instant_Indexing();
-			$this->rmapi = RankMath\Instant_Indexing\Api::get();
+			$this->rmapi     = RankMath\Instant_Indexing\Api::get();
 			add_action( 'admin_init', [ $this, 'remove_rm_admin_page' ] );
 		} else {
 			unset( $this->nav_tabs['bing_settings'] );
@@ -140,7 +159,7 @@ public function __construct() {
 			$this->default_nav_tab = 'console';
 		}
 
-		if ( $this->is_rm_active ) {
+		if ( $this->is_rm_active && isset( $this->nav_tabs['bing_settings'] ) ) {
 			$this->nav_tabs['bing_settings'] = '<span class="dashicons dashicons-yes-alt"></span> ' . $this->nav_tabs['bing_settings'];
 			unset( $this->nav_tabs['console'] );
 			$this->nav_tabs = [ 'console' => __( 'Console', 'fast-indexing-api' ) ] + $this->nav_tabs;
@@ -172,7 +191,7 @@ public function __construct() {
 				add_filter( 'bulk_actions-edit-' . $post_type, [ $this, 'register_bulk_actions' ] );
 				add_filter( 'handle_bulk_actions-edit-' . $post_type, [ $this, 'bulk_action_handler' ], 10, 3 );
 			}
-			add_action( 'trashed_post', [ $this, 'delete_post' ], 10, 1 );
+			add_action( 'wp_trash_post', [ $this, 'delete_post' ], 10, 1 );
 		}
 
 		if ( $this->is_rm_active ) {
@@ -315,7 +334,7 @@ public function send_to_api_link( $actions, $post ) {
 			$actions['rmgiapi_update']    = '<a href="' . admin_url( 'admin.php?page=instant-indexing&tab=console&apiaction=update&_wpnonce=' . $nonce . '&apiurl=' . rawurlencode( get_permalink( $post ) ) ) . '" class="rmgiapi-link rmgiapi_update">' . __( 'Instant Indexing: Google Update', 'fast-indexing-api' ) . '</a>';
 			$actions['rmgiapi_getstatus'] = '<a href="' . admin_url( 'admin.php?page=instant-indexing&tab=console&apiaction=getstatus&_wpnonce=' . $nonce . '&apiurl=' . rawurlencode( get_permalink( $post ) ) ) . '" class="rmgiapi-link rmgiapi_update">' . __( 'Instant Indexing: Google Get Status', 'fast-indexing-api' ) . '</a>';
 		}
-		if ( in_array( $post->post_type, $bing_post_types, true ) ) {
+		if ( in_array( $post->post_type, $bing_post_types, true ) && function_exists( 'rank_math' ) ) {
 			$actions['rmgiapi_bing_submit'] = '<a href="' . admin_url( 'admin.php?page=instant-indexing&tab=console&apiaction=bing_submit&_wpnonce=' . $nonce . '&apiurl=' . rawurlencode( get_permalink( $post ) ) ) . '" class="rmgiapi-link rmgiapi_update">' . __( 'Instant Indexing: Submit to IndexNow', 'fast-indexing-api' ) . '</a>';
 		}
 
@@ -357,13 +376,40 @@ public function ajax_rm_giapi() {
 	 *
 	 * @param  array  $url_input URLs.
 	 * @param  string $action    API action.
+	 * @param  bool   $is_manual Whether the URL is submitted manually by the user.
+	 *
 	 * @return array  $data      Result of the API call.
 	 */
 	public function send_to_api( $url_input, $action, $is_manual = true ) {
 		$url_input  = (array) $url_input;
 		$urls_count = count( $url_input );
 
 		if ( strpos( $action, 'bing' ) === false ) {
+			/**
+			 * Filter the URL to be submitted to IndexNow.
+			 * Returning false will prevent the URL from being submitted.
+			 *
+			 * @param bool   $is_manual Whether the URL is submitted manually by the user.
+			 */
+			$url_input = apply_filters( 'rank_math/instant_indexing/submit_url', $url_input, $is_manual );
+			if ( ! $url_input ) {
+				return false;
+			}
+			$url_input = array_unique( $url_input );
+
+			if ( count( $url_input ) > 100 ) {
+				$url_input = array_slice( $url_input, 0, 100 );
+			}
+
+			$auto_submission_log = get_option( 'giapi_auto_submissions', [] );
+			if ( ! $is_manual ) {
+				// We keep the auto-submitted URLs in a log to prevent duplicates.
+				$logs = array_values( array_reverse( $auto_submission_log ) );
+				if ( ! empty( $logs[0] ) && $logs[0]['url'] === $url_input[0] && time() - $logs[0]['time'] < self::THROTTLE_LIMIT ) {
+					return false;
+				}
+			}
+
 			// This is NOT a Bing API request, so it's Google.
 			include_once RM_GIAPI_PATH . 'vendor/autoload.php';
 			$this->client = new Google_Client();
@@ -387,6 +433,21 @@ public function send_to_api( $url_input, $action, $is_manual = true ) {
 					$request_part = $service->urlNotifications->publish( $post_body ); // phpcs:ignore
 				}
 				$batch->add( $request_part, 'url-' . $i );
+
+				// Log auto-submitted URLs.
+				if ( ! $is_manual ) {
+					$auto_submission_log[] = [
+						'url'  => $url,
+						'time' => time(),
+					];
+				}
+			}
+
+			if ( ! $is_manual ) {
+				if ( count( $auto_submission_log ) > 100 ) {
+					$auto_submission_log = array_slice( $auto_submission_log, -100, 100, true );
+				}
+				update_option( 'giapi_auto_submissions', $auto_submission_log );
 			}
 
 			$results   = $batch->execute();
@@ -420,7 +481,7 @@ public function send_to_api( $url_input, $action, $is_manual = true ) {
 
 			if ( ! $is_manual ) {
 				$logs = array_values( array_reverse( $this->rmapi->get_log() ) );
-				if ( ! empty( $logs[0] ) && $logs[0]['url'] === $url_input[0] && time() - $logs[0]['time'] < 15 ) {
+				if ( ! empty( $logs[0] ) && $logs[0]['url'] === $url_input[0] && time() - $logs[0]['time'] < self::THROTTLE_LIMIT ) {
 					return false;
 				}
 			}
@@ -1084,6 +1145,11 @@ public function delete_post( $post_id ) {
 			return;
 		}
 
+		// Only submit delete action if post was published.
+		if ( $post->post_status !== 'publish' ) {
+			return;
+		}
+
 		$send_url = apply_filters( 'rank_math/indexing_api/delete_url', get_permalink( $post ), $post );
 		// Early exit if filter is set to false.
 		if ( ! $send_url ) {

instant-indexing.php

@@ -3,7 +3,7 @@
  * Plugin Name: Instant Indexing
  * Plugin URI: https://rankmath.com/wordpress/plugin/instant-indexing/
  * Description: Get your website crawled immediately by Google using their NEW Indexing APIs.
- * Version: 1.1.16
+ * Version: 1.1.17
  * Author: Rank Math
  * Author URI: https://s.rankmath.com/home
  * License: GPL v3

readme.txt

@@ -2,10 +2,10 @@
 Contributors: rankmath
 Plugin link: https://rankmath.com/wordpress/plugin/instant-indexing/
 Tags: indexing api, crawling, live streaming, fast indexing, job posting
-Tested up to: 6.2
+Tested up to: 6.2.2
 Requires at least: 5.6
 Requires PHP: 7.2.5
-Stable tag: 1.1.16
+Stable tag: 1.1.17
 License: GPL-2.0+
 License URI: https://www.gnu.org/licenses/gpl-2.0.txt
 
@@ -106,6 +106,12 @@ Technically, yes. That's what the plugin is made to do. But, please note that we
 
 == Changelog ==
 
+= v1.1.17 [May 31, 2023] =
+* Fixed: PHP notice on the plugin settings page.
+* Fixed: Double submission of posts to the Google Indexing API.
+* Fixed: "Submit to IndexNow" action showing even when IndexNow is disabled.
+* Fixed: PHP 8.2 compatibility issues.
+
 = v1.1.16 [Jun 21, 2022] =
 * Updated the Guzzle HTTP library to version 7.4.4 (requires PHP 7.2.5)