fix snoozing yoast tasks

Author: ilicfilip

classes/suggested-tasks/providers/class-remove-terms-without-posts.php

@@ -245,21 +245,27 @@ protected function is_specific_task_completed( $task_id ) {
 	public function get_tasks_to_inject() {
 
 		if (
+			true === $this->is_task_snoozed() ||
 			! $this->should_add_task() // No need to add the task.
 		) {
 			return [];
 		}
 
-		$data = $this->data_collector->collect();
+		$data    = $this->data_collector->collect();
+		$task_id = $this->get_task_id(
+			[
+				'term_id'  => $data['term_id'],
+				'taxonomy' => $data['taxonomy'],
+			]
+		);
+
+		if ( true === \progress_planner()->get_suggested_tasks()->was_task_completed( $task_id ) ) {
+			return [];
+		}
 
 		return [
 			[
-				'task_id'     => $this->get_task_id(
-					[
-						'term_id'  => $data['term_id'],
-						'taxonomy' => $data['taxonomy'],
-					]
-				),
+				'task_id'     => $task_id,
 				'provider_id' => $this->get_provider_id(),
 				'category'    => $this->get_provider_category(),
 				'term_id'     => $data['term_id'],

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

@@ -410,7 +410,7 @@ public function get_tasks_to_inject() {
 		if (
 			true === $this->is_task_snoozed() ||
 			! $this->should_add_task() || // No need to add the task.
-			true === \progress_planner()->get_suggested_tasks()->was_task_completed( $this->get_task_id() )
+			true === \progress_planner()->get_suggested_tasks()->was_task_completed( $task_id )
 		) {
 			return [];
 		}

classes/suggested-tasks/providers/class-update-term-description.php

@@ -238,21 +238,27 @@ protected function is_specific_task_completed( $task_id ) {
 	public function get_tasks_to_inject() {
 
 		if (
+			true === $this->is_task_snoozed() ||
 			! $this->should_add_task() // No need to add the task.
 		) {
 			return [];
 		}
 
-		$data = $this->data_collector->collect();
+		$data    = $this->data_collector->collect();
+		$task_id = $this->get_task_id(
+			[
+				'term_id'  => $data['term_id'],
+				'taxonomy' => $data['taxonomy'],
+			]
+		);
+
+		if ( true === \progress_planner()->get_suggested_tasks()->was_task_completed( $task_id ) ) {
+			return [];
+		}
 
 		return [
 			[
-				'task_id'     => $this->get_task_id(
-					[
-						'term_id'  => $data['term_id'],
-						'taxonomy' => $data['taxonomy'],
-					]
-				),
+				'task_id'     => $task_id,
 				'provider_id' => $this->get_provider_id(),
 				'category'    => $this->get_provider_category(),
 				'term_id'     => $data['term_id'],

classes/suggested-tasks/providers/integrations/yoast/class-cornerstone-workout.php

@@ -51,6 +51,12 @@ class Cornerstone_Workout extends Tasks {
 	 */
 	protected $is_dismissable = true;
 
+	/**
+	 * Whether the task is repetitive.
+	 *
+	 * @var bool
+	 */
+	protected $is_repetitive = true;
 
 	/**
 	 * The task points.
@@ -167,26 +173,6 @@ public function should_add_task() {
 		return true;
 	}
 
-	/**
-	 * Get an array of tasks to inject.
-	 *
-	 * @return array
-	 */
-	public function get_tasks_to_inject() {
-		if ( ! $this->should_add_task() ) {
-			return [];
-		}
-
-		return [
-			[
-				'task_id'     => $this->get_task_id(),
-				'provider_id' => $this->get_provider_id(),
-				'category'    => $this->get_provider_category(),
-				'date'        => \gmdate( 'YW' ),
-			],
-		];
-	}
-
 	/**
 	 * Get the task details.
 	 *

classes/suggested-tasks/providers/integrations/yoast/class-fix-orphaned-content.php

@@ -197,20 +197,27 @@ protected function is_specific_task_completed( $task_id ) {
 	public function get_tasks_to_inject() {
 
 		if (
+			true === $this->is_task_snoozed() ||
 			! $this->should_add_task() // No need to add the task.
 		) {
 			return [];
 		}
 
-		$data = $this->data_collector->collect();
+		$data    = $this->data_collector->collect();
+		$task_id = $this->get_task_id(
+			[
+				'post_id' => $data['post_id'],
+			]
+		);
+
+		// When we have data, check if task was completed.
+		if ( true === \progress_planner()->get_suggested_tasks()->was_task_completed( $task_id ) ) {
+			return [];
+		}
 
 		return [
 			[
-				'task_id'     => $this->get_task_id(
-					[
-						'post_id' => $data['post_id'],
-					]
-				),
+				'task_id'     => $task_id,
 				'provider_id' => $this->get_provider_id(),
 				'category'    => $this->get_provider_category(),
 				'post_id'     => $data['post_id'],

classes/suggested-tasks/providers/integrations/yoast/class-orphaned-content-workout.php

@@ -51,6 +51,13 @@ class Orphaned_Content_Workout extends Tasks {
 	 */
 	protected $is_dismissable = true;
 
+	/**
+	 * Whether the task is repetitive.
+	 *
+	 * @var bool
+	 */
+	protected $is_repetitive = true;
+
 	/**
 	 * The task points.
 	 *
@@ -166,26 +173,6 @@ public function should_add_task() {
 		return true;
 	}
 
-	/**
-	 * Get an array of tasks to inject.
-	 *
-	 * @return array
-	 */
-	public function get_tasks_to_inject() {
-		if ( ! $this->should_add_task() ) {
-			return [];
-		}
-
-		return [
-			[
-				'task_id'     => $this->get_task_id(),
-				'provider_id' => $this->get_provider_id(),
-				'category'    => $this->get_provider_category(),
-				'date'        => \gmdate( 'YW' ),
-			],
-		];
-	}
-
 	/**
 	 * Get the task details.
 	 *