Merge branch 'develop' into filip/wp-cli

Author: aristath

assets/js/widgets/suggested-tasks.js

@@ -44,29 +44,34 @@ const prplSuggestedTasksWidget = {
 				per_page: prplSuggestedTask.maxItemsPerCategory[ category ],
 			} );
 
-			// Inject pending celebration tasks.
-			celebrationPromises.push(
-				prplSuggestedTask
-					.injectItemsFromCategory( {
-						category,
-						status: [ 'pending' ],
-						per_page: 100,
-					} )
-					.then( ( data ) => {
-						// If there were pending tasks.
-						if ( data.length ) {
-							// Set post status to trash.
-							data.forEach( ( task ) => {
-								const post =
-									new wp.api.models.Prpl_recommendations( {
-										id: task.id,
-									} );
-								// Destroy the post, without the force parameter.
-								post.destroy( { url: post.url() } );
-							} );
-						}
-					} )
-			);
+			// We trigger celebration only on Progress Planner dashboard page.
+			if ( ! prplSuggestedTask.delayCelebration ) {
+				// Inject pending celebration tasks.
+				celebrationPromises.push(
+					prplSuggestedTask
+						.injectItemsFromCategory( {
+							category,
+							status: [ 'pending' ],
+							per_page: 100,
+						} )
+						.then( ( data ) => {
+							// If there were pending tasks.
+							if ( data.length ) {
+								// Set post status to trash.
+								data.forEach( ( task ) => {
+									const post =
+										new wp.api.models.Prpl_recommendations(
+											{
+												id: task.id,
+											}
+										);
+									// Destroy the post, without the force parameter.
+									post.destroy( { url: post.url() } );
+								} );
+							}
+						} )
+				);
+			}
 		}
 
 		// Trigger celebration once, for all categories.

classes/admin/class-enqueue.php

@@ -219,6 +219,14 @@ public function localize_script( $handle, $localize_data = [] ) {
 				if ( isset( $max_items_per_category['user'] ) ) {
 					$max_items_per_category['user'] = 100;
 				}
+
+				// Celebrate only on the Progress Planner Dashboard page.
+				$delay_celebration = true;
+				if ( \progress_planner()->is_on_progress_planner_dashboard_page() ) {
+					// should_show_upgrade_popover() also checks if we're on the Progress Planner Dashboard page - but let's be explicit since that method might change in the future.
+					$delay_celebration = \progress_planner()->get_plugin_upgrade_tasks()->should_show_upgrade_popover();
+				}
+
 				$localize_data = [
 					'name' => 'prplSuggestedTask',
 					'data' => [
@@ -228,6 +236,7 @@ public function localize_script( $handle, $localize_data = [] ) {
 							'snoozeIcon' => constant( 'PROGRESS_PLANNER_URL' ) . '/assets/images/icon_snooze.svg',
 						],
 						'maxItemsPerCategory' => apply_filters( 'progress_planner_suggested_tasks_max_items_per_category', $max_items_per_category ),
+						'delayCelebration'    => $delay_celebration,
 					],
 				];
 				break;

classes/admin/widgets/class-suggested-tasks.php

@@ -49,27 +49,6 @@ public function get_score() {
 	 * @return void
 	 */
 	public function enqueue_scripts() {
-		// Celebrate only on the Progress Planner Dashboard page.
-		$delay_celebration = false;
-		if ( \progress_planner()->is_on_progress_planner_dashboard_page() ) {
-			// should_show_upgrade_popover() also checks if we're on the Progress Planner Dashboard page - but let's be explicit since that method might change in the future.
-			$delay_celebration = \progress_planner()->get_plugin_upgrade_tasks()->should_show_upgrade_popover();
-		}
-
-		// Enqueue the script.
-		\progress_planner()->get_admin__enqueue()->enqueue_script(
-			'widgets/suggested-tasks',
-			[
-				'name' => 'prplSuggestedTasks',
-				'data' => [
-					'ajaxUrl'          => \admin_url( 'admin-ajax.php' ),
-					'nonce'            => \wp_create_nonce( 'progress_planner' ),
-					'tasks'            => [], // This is set in the JS file.
-					'delayCelebration' => $delay_celebration,
-				],
-			]
-		);
-
 		// Enqueue the badge scroller script.
 		\progress_planner()->get_admin__enqueue()->enqueue_script(
 			'widgets/suggested-tasks-badge-scroller',

classes/class-suggested-tasks-db.php

@@ -36,6 +36,17 @@ public function add( $data ) {
 			return 0;
 		}
 
+		// Set lock transient.
+		$transient_key = 'prpl_task_lock_' . $data['task_id'];
+
+		// Check if the task is already being processed.
+		if ( \get_transient( $transient_key ) ) {
+			return 0;
+		}
+
+		// Set lock transient.
+		\set_transient( $transient_key, true, 5 );
+
 		// Check if we have an existing task with the same title.
 		$posts = $this->get_tasks_by(
 			[
@@ -53,6 +64,7 @@ public function add( $data ) {
 
 		// If we have an existing task, skip.
 		if ( ! empty( $posts ) ) {
+			\delete_transient( $transient_key );
 			return $posts[0]->ID;
 		}
 
@@ -137,6 +149,8 @@ public function add( $data ) {
 			\update_post_meta( $post_id, "prpl_$key", $value );
 		}
 
+		\delete_transient( $transient_key );
+
 		return $post_id;
 	}
 

classes/suggested-tasks/providers/class-content-review.php

@@ -285,7 +285,7 @@ public function should_add_task() {
 				continue;
 			}
 
-			$task_id = $this->get_task_id( [ 'post_id' => $post->ID ] );
+			$task_id = $this->get_task_id( [ 'target_post_id' => $post->ID ] );
 
 			// Don't add the task if it was completed.
 			if ( true === \progress_planner()->get_suggested_tasks()->was_task_completed( $task_id ) ) {
@@ -320,7 +320,7 @@ public function get_tasks_to_inject() {
 				}
 
 				$task_to_inject[] = [
-					'task_id'          => $this->get_task_id( [ 'post_id' => $task_data['target_post_id'] ] ),
+					'task_id'          => $this->get_task_id( [ 'target_post_id' => $task_data['target_post_id'] ] ),
 					'provider_id'      => $this->get_provider_id(),
 					'category'         => $this->get_provider_category(),
 					'target_post_id'   => $task_data['target_post_id'],