Merge branch 'develop' into ari/new-task-publish-draft-content

Author: aristath

classes/class-page-types.php

@@ -383,14 +383,14 @@ public function update_option_page_on_front( $page_id ) {
 	 *
 	 * Runs on post_updated hook.
 	 *
-	 * @param int      $post_id The post ID.
-	 * @param \WP_Post $post    The post object.
+	 * @param int           $post_id The post ID.
+	 * @param \WP_Post|null $post    The post object.
 	 *
 	 * @return void
 	 */
 	public function post_updated( $post_id, $post ) {
 		// Check if the post is set as a homepage.
-		if ( 'page' !== $post->post_type || 'publish' !== $post->post_status ) {
+		if ( ! $post || 'page' !== $post->post_type || 'publish' !== $post->post_status ) {
 			return;
 		}
 

classes/class-plugin-migrations.php

@@ -85,6 +85,14 @@ function ( $file ) {
 		);
 		\sort( $updates );
 
+		// Remove "class-update" from the updates.
+		$updates = \array_filter(
+			$updates,
+			function ( $update ) {
+				return $update !== 'class-update';
+			}
+		);
+
 		// Run the upgrades.
 		foreach ( $updates as $version_int ) {
 			$upgrade_class = 'Progress_Planner\Update\Update_' . $version_int;

classes/class-suggested-tasks.php

@@ -479,7 +479,6 @@ public function get_tasks_in_rest_format( array $args = [] ) {
 
 		// Get the tasks for each category.
 		foreach ( $max_items_per_category as $category_slug => $max_items ) {
-
 			// Skip excluded providers.
 			if ( ! empty( $args['exclude_provider'] ) && \in_array( $category_slug, $args['exclude_provider'], true ) ) {
 				continue;

classes/class-todo.php

@@ -76,7 +76,6 @@ public function maybe_change_first_item_points_on_monday() {
 	 * @return void
 	 */
 	public function handle_creating_user_task( $post, $request, $creating ) {
-
 		if ( ! $creating || ! \has_term( 'user', 'prpl_recommendations_provider', $post->ID ) ) {
 			return;
 		}

classes/rest/class-tasks.php

@@ -77,7 +77,6 @@ public function validate_token( $token ) {
 	 * @return \WP_REST_Response The REST response object containing the recommendations.
 	 */
 	public function get_tasks() {
-
 		// Collection of task objects.
 		$tasks           = \progress_planner()->get_suggested_tasks_db()->get_tasks_by( [ 'post_status' => [ 'publish', 'trash', 'draft', 'future', 'pending' ] ] );
 		$tasks_to_return = [];

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

@@ -86,6 +86,9 @@ public function __construct() {
 
 		// Add the cleanup action.
 		\add_action( 'admin_init', [ $this, 'cleanup_pending_tasks' ] );
+
+		// Handle tasks when snoozed period is over.
+		\add_action( 'transition_post_status', [ $this, 'handle_task_unsnooze' ], 10, 3 );
 	}
 
 	/**
@@ -289,4 +292,37 @@ public function cleanup_pending_tasks() {
 
 		\progress_planner()->get_utils__cache()->set( 'cleanup_pending_tasks', true, DAY_IN_SECONDS );
 	}
+
+	/**
+	 * Handle task unsnooze.
+	 *
+	 * @param string   $new_status The new status.
+	 * @param string   $old_status The old status.
+	 * @param \WP_Post $post The post.
+	 *
+	 * @return void
+	 */
+	public function handle_task_unsnooze( $new_status, $old_status, $post ) {
+		// Early exit if it's not task for which snooze period is over.
+		if ( 'future' !== $old_status || 'publish' !== $new_status || 'prpl_recommendations' !== get_post_type( $post ) ) {
+			return;
+		}
+
+		$task = \progress_planner()->get_suggested_tasks_db()->get_post( $post->ID );
+		if ( ! $task ) {
+			return;
+		}
+
+		$task_provider = $this->get_task_provider( $task->get_provider_id() );
+
+		// Delete tasks which don't have a task provider or repetitive tasks which were created in the previous week.
+		if ( ! $task_provider || ( $task_provider->is_repetitive() && ( ! $task->date || \gmdate( 'YW' ) !== (string) $task->date ) ) ) {
+			\progress_planner()->get_suggested_tasks_db()->delete_recommendation( $task->ID );
+		}
+
+		// Delete the task if it is not relevant anymore.
+		if ( $task_provider instanceof \Progress_Planner\Suggested_Tasks\Providers\Tasks && ! $task_provider->should_add_task() ) {
+			\progress_planner()->get_suggested_tasks_db()->delete_recommendation( $task->ID );
+		}
+	}
 }

classes/suggested-tasks/data-collector/class-post-author.php

@@ -34,14 +34,14 @@ public function init() {
 	/**
 	 * Update the cache when the post author changes.
 	 *
-	 * @param int      $post_id The post ID.
-	 * @param \WP_Post $post_after The post object following the update.
-	 * @param \WP_Post $post_before The post object before the update.
+	 * @param int           $post_id The post ID.
+	 * @param \WP_Post|null $post_after The post object following the update.
+	 * @param \WP_Post      $post_before The post object before the update.
 	 *
 	 * @return void
 	 */
 	public function update_post_author_on_change( $post_id, $post_after, $post_before ) {
-		if ( $post_after->post_author !== $post_before->post_author ) {
+		if ( $post_after && $post_after->post_author !== $post_before->post_author ) {
 			$this->update_cache();
 		}
 	}

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

@@ -109,7 +109,6 @@ class Email_Sending extends Tasks {
 	 * @return void
 	 */
 	public function init() {
-
 		// Enqueue the scripts.
 		\add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
 

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

@@ -443,7 +443,7 @@ public function evaluate_task( $task_id ) {
 	 *
 	 * @return bool true means that the task condition is satisfied, meaning that we don't need to add the task or task was completed.
 	 */
-	abstract protected function should_add_task();
+	abstract public function should_add_task();
 
 	/**
 	 * Alias for should_add_task(), for better readability when using in the evaluate_task() method.

classes/update/class-update-111.php

@@ -14,7 +14,7 @@
  *
  * @package Progress_Planner
  */
-class Update_111 {
+class Update_111 extends Update {
 
 	const VERSION = '1.1.1';