Merge pull request #146 from ProgressPlanner/develop

v2.1.3

Author: aristath

comment-hacks.php

@@ -4,7 +4,7 @@
  *
  * @wordpress-plugin
  * Plugin Name:  Comment Experience
- * Version:      2.1.2
+ * Version:      2.1.3
  * Plugin URI:   https://progressplanner.com/plugins/comment-experience/
  * Description:  Improve the comment experience on your site. Adds lots of features to make commenting easier and more engaging.
  * Requires PHP: 7.4
@@ -35,7 +35,7 @@
 /**
  * Used for version checks.
  */
-define( 'EMILIA_COMMENT_HACKS_VERSION', '2.1.1' );
+define( 'EMILIA_COMMENT_HACKS_VERSION', '2.1.3' );
 
 /**
  * Used for asset embedding.

inc/progress-planner/comment-moderation.php

@@ -10,6 +10,8 @@
 
 /**
  * Task for the comment moderation.
+ *
+ * @property string $url
  */
 class Comment_Moderation extends Repetitive {
 
@@ -34,6 +36,35 @@ class Comment_Moderation extends Repetitive {
 	 */
 	protected const CAPABILITY = 'moderate_comments';
 
+	/**
+	 * Constructor.
+	 *
+	 * @property string $url
+	 *
+	 * @return void
+	 */
+	public function __construct() {
+		$this->url = \admin_url( 'edit-comments.php?comment_status=moderated' );
+	}
+
+	/**
+	 * Get the title.
+	 *
+	 * @return string
+	 */
+	public function get_title() {
+		return \esc_html__( 'Moderate comments', 'comment-hacks' );
+	}
+
+	/**
+	 * Get the description.
+	 *
+	 * @return string
+	 */
+	public function get_description() {
+		return \esc_html__( 'Moderate comments to make sure they are not spam.', 'comment-hacks' );
+	}
+
 	/**
 	 * Check if the task should be added.
 	 *
@@ -74,13 +105,13 @@ public function get_task_details( $task_id = '' ) {
 
 		return [
 			'task_id'      => $task_id,
-			'title'        => \esc_html__( 'Moderate comments', 'comment-hacks' ),
+			'title'        => $this->get_title(),
 			'parent'       => 0,
 			'priority'     => 'high',
 			'category'     => $this->get_provider_category(),
 			'points'       => 1,
-			'url'          => $this->capability_required() ? \esc_url( \admin_url( 'edit-comments.php?comment_status=moderated' ) ) : '',
-			'description'  => '<p>' . \esc_html__( 'Moderate comments to make sure they are not spam.', 'comment-hacks' ) . '</p>',
+			'url'          => $this->get_url(),
+			'description'  => $this->get_description(),
 		];
 	}
 }

inc/progress-planner/comment-policy.php

@@ -12,8 +12,6 @@
 /**
  * Task for the comment policy.
  *
- * @property string $title
- * @property string $description
  * @property string $url
  */
 class Comment_Policy extends One_Time {
@@ -41,17 +39,36 @@ class Comment_Policy extends One_Time {
 
 	/**
 	 * Class constructor.
+	 *
+	 * @property string $url
+	 *
+	 * @return void
 	 */
 	public function __construct() {
 		$this->options = Hacks::get_options();
+		$this->url     = \admin_url( 'options-general.php?page=comment-experience#top#comment-policy' );
+	}
 
-		$this->title       = \esc_html__( 'Implement a comment policy', 'comment-hacks' );
-		$this->description = \sprintf(
+	/**
+	 * Get the title.
+	 *
+	 * @return string
+	 */
+	public function get_title() {
+		return \esc_html__( 'Implement a comment policy', 'comment-hacks' );
+	}
+
+	/**
+	 * Get the description.
+	 *
+	 * @return string
+	 */
+	public function get_description() {
+		return \sprintf(
 			/* translators: %s:<a href="https://prpl.fyi/comment-policy" target="_blank">comment policy</a> link */
 			\esc_html__( 'Implement a %s to make sure your commenters know what they can and cannot do.', 'comment-hacks' ),
 			'<a href="https://prpl.fyi/comment-policy" target="_blank">' . \esc_html__( 'comment policy', 'comment-hacks' ) . '</a>'
 		);
-		$this->url = \admin_url( 'options-general.php?page=comment-policy#top#comment-policy' );
 	}
 
 	/**

inc/progress-planner/comment-redirect.php

@@ -12,8 +12,6 @@
 /**
  * Task for the comment redirect.
  *
- * @property string $title
- * @property string $description
  * @property string $url
  */
 class Comment_Redirect extends One_Time {
@@ -41,17 +39,36 @@ class Comment_Redirect extends One_Time {
 
 	/**
 	 * Class constructor.
+	 *
+	 * @property string $url
+	 *
+	 * @return void
 	 */
 	public function __construct() {
 		$this->options = Hacks::get_options();
+		$this->url     = \admin_url( 'options-general.php?page=comment-experience#top#comment-redirect' );
+	}
 
-		$this->title       = \esc_html__( 'Implement a comment redirect', 'comment-hacks' );
-		$this->description = \sprintf(
+	/**
+	 * Get the title.
+	 *
+	 * @return string
+	 */
+	public function get_title() {
+		return \esc_html__( 'Implement a comment redirect', 'comment-hacks' );
+	}
+
+	/**
+	 * Get the description.
+	 *
+	 * @return string
+	 */
+	public function get_description() {
+		return \sprintf(
 			/* translators: %s:<a href="https://prpl.fyi/comment-redirect" target="_blank">comment redirect</a> link */
 			\esc_html__( 'Implement a %s to thank first-time commenters for their comment.', 'comment-hacks' ),
 			'<a href="https://prpl.fyi/comment-policy" target="_blank">' . \esc_html__( 'comment redirect', 'comment-hacks' ) . '</a>'
 		);
-		$this->url = \admin_url( 'options-general.php?page=comment-policy#top#comment-redirect' );
 	}
 
 	/**

readme.txt

@@ -4,7 +4,7 @@ Tags: comments, spam, emails
 Text Domain: comment-hacks
 Requires at least: 5.9
 Tested up to: 6.8
-Stable tag: 2.1.2
+Stable tag: 2.1.3
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Requires PHP: 7.4
@@ -59,6 +59,15 @@ If you have bugs to report, please go to [the plugin's GitHub repository](https:
 
 == Changelog ==
 
+= 2.1.3 =
+
+* Add necessary compatibility to Progress Planner integration for the upcoming WordPress 6.8.
+
+= 2.1.2 =
+
+* Rename the plugin from "Comment Hacks" to "Comment Experience".
+* Bring up to date with changes in Progress Planner
+
 = 2.1.1 =
 
 * Don't enqueue the remove URL script on the frontend for logged out users or users without the `edit_posts` capability.