Merge pull request #2105 from 10up/fix/issue-2104

Autosuggest: Helper function to delete cached query

includes/classes/Command.php

@@ -752,6 +752,17 @@ public function index( $args, $assoc_args ) {
 			update_option( 'ep_last_cli_index', $index_results, false );
 		}
 
+		/**
+		 * Fires after executing a CLI index
+		 *
+		 * @hook ep_wp_cli_after_index
+		 * @param  {array} $args CLI command position args
+		 * @param {array} $assoc_args CLI command associative args
+		 *
+		 * @since 3.5.5
+		 */
+		do_action( 'ep_wp_cli_after_index', $args, $assoc_args );
+
 		WP_CLI::log( WP_CLI::colorize( '%Y' . esc_html__( 'Total time elapsed: ', 'elasticpress' ) . '%N' . $index_time ) );
 
 		$this->delete_transient();
@@ -1269,8 +1280,26 @@ private function delete_transient() {
 	 * @since      3.4
 	 */
 	public function clear_index() {
+		/**
+		 * Fires before the CLI `clear-index` command is executed.
+		 *
+		 * @hook ep_cli_before_clear_index
+		 *
+		 * @since 3.5.5
+		 */
+		do_action( 'ep_cli_before_clear_index' );
+
 		$this->delete_transient();
 
+		/**
+		 * Fires after the CLI `clear-index` command is executed.
+		 *
+		 * @hook ep_cli_after_clear_index
+		 *
+		 * @since 3.5.5
+		 */
+		do_action( 'ep_cli_after_clear_index' );
+
 		WP_CLI::success( esc_html__( 'Index cleared.', 'elasticpress' ) );
 	}
 
@@ -1448,6 +1477,17 @@ public function stop_indexing( $args, $assoc_args ) {
 	 * @param array $assoc_args Associative CLI args.
 	 */
 	public function set_search_algorithm_version( $args, $assoc_args ) {
+		/**
+		 * Fires before the algorithm version is changed via WP-CLI.
+		 *
+		 * @hook ep_cli_before_set_search_algorithm_version
+		 * @param  {array} $args CLI command position args
+		 * @param {array} $assoc_args CLI command associative args
+		 *
+		 * @since 3.5.5
+		 */
+		do_action( 'ep_cli_before_set_search_algorithm_version', $args, $assoc_args );
+
 		if ( empty( $assoc_args['version'] ) && ! isset( $assoc_args['default'] ) ) {
 			WP_CLI::error( esc_html__( 'This command expects a version number or the --default flag.', 'elasticpress' ) );
 		}
@@ -1466,6 +1506,17 @@ public function set_search_algorithm_version( $args, $assoc_args ) {
 			}
 		}
 
+		/**
+		 * Fires after the algorithm version is changed via WP-CLI.
+		 *
+		 * @hook ep_cli_after_set_search_algorithm_version
+		 * @param  {array} $args CLI command position args
+		 * @param {array} $assoc_args CLI command associative args
+		 *
+		 * @since 3.5.5
+		 */
+		do_action( 'ep_cli_after_set_search_algorithm_version', $args, $assoc_args );
+
 		WP_CLI::success( esc_html__( 'Done.', 'elasticpress' ) );
 	}
 

includes/classes/Feature/Autosuggest/Autosuggest.php

@@ -91,6 +91,12 @@ public function setup() {
 		add_filter( 'ep_pre_dashboard_index', [ $this, 'epio_send_autosuggest_public_request' ] );
 		add_filter( 'ep_wp_cli_pre_index', [ $this, 'epio_send_autosuggest_public_request' ] );
 		add_filter( 'debug_information', [ $this, 'epio_autosuggest_health_check_info' ] );
+
+		add_action( 'ep_cli_after_set_search_algorithm_version', [ $this, 'delete_cached_query' ] );
+		add_action( 'ep_wp_cli_after_index', [ $this, 'delete_cached_query' ] );
+		add_action( 'ep_after_dashboard_index', [ $this, 'delete_cached_query' ] );
+		add_action( 'ep_after_update_feature', [ $this, 'delete_cached_query' ] );
+		add_action( 'ep_cli_after_clear_index', [ $this, 'delete_cached_query' ] );
 	}
 
 	/**
@@ -562,13 +568,28 @@ public function intercept_search_request( $response, $query = [], $args = [], $f
 				if ( isset( $request->http_response ) && isset( $request->http_response->body ) ) {
 					$request->http_response->body = '';
 				}
-				set_transient( $cache_key, $request, 300 );
+				set_transient( $cache_key, $request, 5 * MINUTE_IN_SECONDS );
 			}
 		}
 
 		return $request;
 	}
 
+	/**
+	 * Delete the cached query for autosuggest.
+	 *
+	 * @since 3.5.5
+	 */
+	public function delete_cached_query() {
+		global $wp_object_cache;
+		if ( wp_using_ext_object_cache() ) {
+			// Delete the entire group.
+			unset( $wp_object_cache->cache['ep_autosuggest'] );
+		} else {
+			delete_transient( 'ep_autosuggest_query_request_cache' );
+		}
+	}
+
 	/**
 	 * Tell user whether requirements for feature are met or not.
 	 *

includes/classes/Features.php

@@ -153,6 +153,23 @@ public function update_feature( $slug, $settings, $force = true ) {
 			$feature->post_activation();
 		}
 
+		/**
+		 * Fires after activating, inactivating, or just updating a feature.
+		 *
+		 * @hook ep_after_update_feature
+		 * @param  {string} $feature Feature slug
+		 * @param  {array} $settings Feature settings
+		 * @param  {array} $data Feature activation data
+		 *
+		 * @since 3.5.5
+		 */
+		do_action(
+			'ep_after_update_feature',
+			$slug,
+			$settings,
+			$data
+		);
+
 		return $data;
 	}
 

includes/dashboard.php

@@ -662,13 +662,24 @@ function action_wp_ajax_ep_index() {
 
 						$indexable_object->create_network_alias( $indexes );
 					}
+
+						/**
+						 * Fires after executing a reindex via Dashboard
+						 *
+						 * @since  3.5.5
+						 * @hook ep_after_dashboard_index
+						 */
+						do_action( 'ep_after_dashboard_index' );
 				} else {
 					$index_meta['offset'] = (int) $query['total_objects'];
 				}
 			} else {
 				$index_meta['offset'] = (int) $query['total_objects'];
 
 				delete_option( 'ep_index_meta' );
+
+				/* This action is documented in this file */
+				do_action( 'ep_after_dashboard_index' );
 			}
 		}
 	} else {