add "is_completed" callback

Author: ilicfilip

classes/activities/class-suggested-task.php

@@ -66,12 +66,8 @@ public function get_points( $date ) {
 		$points = 1;
 		$tasks  = \progress_planner()->get_suggested_tasks_db()->get_tasks_by( [ 'task_id' => $this->data_id ] );
 
-		if ( ! empty( $tasks ) && $tasks[0]->get_provider_id() ) {
-			$task_provider = \progress_planner()->get_suggested_tasks()->get_tasks_manager()->get_task_provider( $tasks[0]->get_provider_id() );
-
-			if ( $task_provider ) {
-				$points = $task_provider->get_points();
-			}
+		if ( ! empty( $tasks ) ) {
+			$points = $tasks[0]->points;
 		}
 		$this->points[ $date_ymd ] = $points;
 

classes/class-suggested-tasks-db.php

@@ -293,7 +293,7 @@ public function get_post( $id ) {
 	 *
 	 * @param array $params The parameters to filter by ([ 'provider' => 'provider_id' ] etc).
 	 *
-	 * @return array
+	 * @return array<\Progress_Planner\Suggested_Tasks\Task>
 	 */
 	public function get_tasks_by( $params ) {
 		$args = [];
@@ -339,7 +339,7 @@ public function get_tasks_by( $params ) {
 	 *
 	 * @param array $args The arguments.
 	 *
-	 * @return array
+	 * @return array<\Progress_Planner\Suggested_Tasks\Task>
 	 */
 	public function get( $args = [] ) {
 		$args = \wp_parse_args(

classes/class-suggested-tasks.php

@@ -65,6 +65,8 @@ public function __construct() {
 
 		// Filter the REST API response.
 		\add_filter( 'rest_prepare_prpl_recommendations', [ $this, 'rest_prepare_recommendation' ], 10, 2 );
+
+		\add_filter( 'wp_trash_post_days', [ $this, 'change_trashed_posts_lifetime' ], 10, 2 );
 	}
 
 	/**
@@ -153,7 +155,7 @@ public function on_automatic_updates_complete(): void {
 		\progress_planner()->get_suggested_tasks_db()->update_recommendation( $pending_tasks[0]->ID, [ 'post_status' => 'trash' ] );
 
 		// Insert an activity.
-		$this->insert_activity( $pending_tasks[0]->ID );
+		$this->insert_activity( $pending_tasks[0]->task_id );
 	}
 
 	/**
@@ -339,6 +341,22 @@ public function register_post_type() {
 		}
 	}
 
+	/**
+	 * Custom trash lifetime by post type.
+	 *
+	 * @param int      $days The number of days to keep in trash.
+	 * @param \WP_Post $post The post.
+	 *
+	 * @return int
+	 */
+	public function change_trashed_posts_lifetime( $days, $post ) {
+		if ( 'prpl_recommendations' === $post->post_type ) {
+			return 60;
+		}
+
+		return $days;
+	}
+
 	/**
 	 * Register a custom taxonomies for suggested tasks.
 	 *

classes/class-todo.php

@@ -25,52 +25,6 @@ public function __construct() {
 		\add_action( 'rest_after_insert_prpl_recommendations', [ $this, 'handle_creating_user_task' ], 10, 3 );
 	}
 
-	/**
-	 * Get the points for a new task.
-	 *
-	 * @return int
-	 */
-	public function calc_points_for_new_task() {
-		$items = \progress_planner()->get_suggested_tasks_db()->get_tasks_by( [ 'provider_id' => 'user' ] );
-
-		// If this is the first user task ever, return 1.
-		if ( ! count( $items ) ) {
-			return 1;
-		}
-
-		// Get the task IDs from the todos.
-		$task_ids = array_column( $items, 'task_id' );
-
-		// Get the completed activities for this week that are in the todos.
-		$activities = array_filter(
-			\progress_planner()->get_activities__query()->query_activities(
-				[
-					'start_date' => new \DateTime( 'monday this week' ),
-					'end_date'   => new \DateTime( 'sunday this week' ),
-					'category'   => 'suggested_task',
-					'type'       => 'completed',
-				]
-			),
-			function ( $activity ) use ( $task_ids ) {
-				return in_array( $activity->data_id, $task_ids, true );
-			}
-		);
-
-		// If there are completed todos this week, we already have set the golden task and it was completed.
-		if ( count( $activities ) ) {
-			return 0;
-		}
-
-		// Check if there are already published user tasks with a points value other than 0.
-		foreach ( $items as $item ) {
-			if ( 'publish' === $item['post_status'] && isset( $item['points'] ) && $item['points'] !== 0 ) {
-				return 0;
-			}
-		}
-
-		return 1;
-	}
-
 	/**
 	 * Maybe change the points of the first item in the todo list on Monday.
 	 *

classes/suggested-tasks/class-task.php

@@ -29,6 +29,7 @@
  * @property int|null $target_term_id The target term ID for the task
  * @property string|null $target_taxonomy The target taxonomy for the task
  * @property string|null $target_term_name The target term name for the task
+ * @property string|null $date The task date in YW format (year-week)
  */
 class Task {
 	/**

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

@@ -48,21 +48,30 @@ public function should_add_task() {
 	 * @return array
 	 */
 	public function get_tasks_to_inject() {
+		// We don't need to inject tasks for this provider.
+		return [];
+	}
 
-		$tasks       = [];
-		$saved_tasks = \progress_planner()->get_settings()->get( 'tasks', [] );
-		foreach ( $saved_tasks as $task_data ) {
-			if ( isset( $task_data['provider_id'] ) && self::PROVIDER_ID === $task_data['provider_id'] ) {
-				$tasks[] = [
-					'task_id'     => $task_data['task_id'],
-					'provider_id' => $this->get_provider_id(),
-					'category'    => $this->get_provider_category(),
-					'points'      => 0,
-				];
-			}
+	/**
+	 * Check if a specific task is completed.
+	 * Child classes can override this method to handle specific task IDs.
+	 *
+	 * @param string $task_id The task ID to check.
+	 * @return bool
+	 */
+	protected function is_specific_task_completed( $task_id ) {
+		$tasks = \progress_planner()->get_suggested_tasks_db()->get_tasks_by( [ 'task_id' => $task_id ] );
+		if ( empty( $tasks ) ) {
+			return false;
+		}
+
+		$task_data = $tasks[0]->get_data();
+
+		if ( isset( $task_data['is_completed_callback'] ) && is_callable( $task_data['is_completed_callback'] ) ) {
+			return call_user_func( $task_data['is_completed_callback'], $task_id );
 		}
 
-		return $tasks;
+		return false;
 	}
 
 	/**

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

@@ -402,7 +402,8 @@ public function evaluate_task( $task_id ) {
 		}
 
 		if ( ! $this->is_repetitive() ) {
-			if ( ! $task->task_id || 0 !== strpos( $task->task_id, $this->get_task_id() ) ) {
+			// TODO: Collaborator tasks have custom task_ids.
+			if ( ! $task->task_id || ( 0 !== strpos( $task->task_id, $this->get_task_id() ) && 'collaborator' !== $this->get_provider_id() ) ) {
 				return false;
 			}
 			return $this->is_task_completed( $task->task_id ) ? $task : false;

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

@@ -93,7 +93,7 @@ public function maybe_update_workout_status( $old_value, $value, $option ) {
 		}
 
 		// For this type of task only the provider ID is needed, but just in case.
-		if ( $this->is_task_dismissed( $tasks[0] ) ) {
+		if ( $this->is_task_dismissed( $tasks[0]->get_data() ) ) {
 			return;
 		}
 

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

@@ -96,7 +96,7 @@ public function maybe_update_workout_status( $old_value, $value, $option ) {
 		}
 
 		// For this type of task only the provider ID is needed, but just in case.
-		if ( $this->is_task_dismissed( $tasks[0] ) ) {
+		if ( $this->is_task_dismissed( $tasks[0]->get_data() ) ) {
 			return;
 		}
 

classes/utils/class-debug-tools.php

@@ -238,7 +238,7 @@ protected function add_suggested_tasks_submenu_item( $admin_bar ) {
 				foreach ( $suggested_tasks as $task ) {
 					$title = $task->post_title;
 					if ( $task->post_status && 'future' === $task->post_status && $task->post_date ) {
-						$until  = is_float( $task->post_date ) ? '(forever)' : '(until ' . $task->post_date . ')';
+						$until  = '(until ' . $task->post_date . ')';
 						$title .= ' ' . $until;
 					}