fix: issues from alpha.10 preventing valid comments

pluginkollektiv · Dec 17, 2023 · 490cbd3 · 490cbd3
1 parent 645dde6
commit 490cbd3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/src/Handlers/Comment.php b/src/Handlers/Comment.php
@@ -23,7 +23,7 @@ function () {
 	}
 
 	public static function process( $comment ) {
-		if ( ! ContentTypeHelper::reaction_is_one_of( $comment, [ ContentTypeHelper::COMMENT_TYPE ], 'comment' ) ) {
+		if ( ! ContentTypeHelper::reaction_is_one_of( $comment, [ 'comment', '' ], 'comment' ) ) {
 			return $comment;
 		}
 

diff --git a/src/Handlers/Linkback.php b/src/Handlers/Linkback.php
@@ -10,7 +10,7 @@ class Linkback extends Reaction {
 	protected static $type = 'linkback';
 
 	public static function process( $linkback ) {
-		if ( ! ContentTypeHelper::reaction_is_one_of( $linkback, [ ContentTypeHelper::LINKBACK_TYPE ], 'linkback' ) ) {
+		if ( ! ContentTypeHelper::reaction_is_one_of( $linkback, [ 'pingback', 'trackback', 'pings' ], 'linkback' ) ) {
 			return $linkback;
 		}
 

diff --git a/src/Helpers/ContentTypeHelper.php b/src/Helpers/ContentTypeHelper.php
@@ -31,7 +31,8 @@ public static function get_type_name( $item_type ) {
 	 * @return bool
 	 */
 	public static function reaction_is_one_of( $reaction, $reaction_types, $context = '' ) {
-		$reaction_type = $reaction['reaction_type'] ?? '';
+		// This `comment_type` is set from WordPress.
+		$reaction_type = $reaction['comment_type'] ?? '';
 
 		$is_one_of = in_array( $reaction_type, $reaction_types );
 

diff --git a/src/Rules/DbSpam.php b/src/Rules/DbSpam.php
@@ -15,12 +15,13 @@ class DbSpam extends ControllableBase implements SpamReason {
 	public static function verify( $item ) {
 		$params = [];
 		$filter = [];
-		$url    = DataHelper::get_values_where_key_contains( [ 'url' ], $item );
+		$url    = wp_unslash( array_shift( DataHelper::get_values_where_key_contains( [ 'url' ], $item ) ) );
 
 		if ( ! empty( $url ) ) {
 			$filter[] = '`comment_author_url` = %s';
-			$params[] = wp_unslash( array_shift( $url ) );
+			$params[] =  $url;
 		}
+
 		$ip = DataHelper::get_values_by_keys( [ 'comment_author_IP' ], $item );
 
 		if ( ! empty( $ip ) ) {

diff --git a/src/Rules/EmptyData.php b/src/Rules/EmptyData.php
@@ -23,7 +23,7 @@ public static function verify( $item ) {
 		}
 
 		if ( $item[ 'reaction_type'] === ContentTypeHelper::COMMENT_TYPE ) {
-			if ( get_option( 'require_name_email' ) && ( empty( $comment['comment_author_email'] ) || empty( $comment['comment_author'] ) ) ) {
+			if ( get_option( 'require_name_email' ) && ( empty( $item['comment_author_email'] ) || empty( $item['comment_author'] ) ) ) {
 				return 999;
 			}
 		}

diff --git a/src/Rules/Honeypot.php b/src/Rules/Honeypot.php
@@ -59,13 +59,13 @@ public static function precheck() {
 		}
 		$fields = [];
 		foreach ( $_POST as $key => $value ) {
-			if ( $key === HoneypotField::get_secret_name_for_post() ) {
-				$fields['plugin_field'] = $key;
-			}
 			if ( isset( $fields['plugin_field'] ) ) {
 				$fields['hidden_field'] = $key;
 				break;
 			}
+			if ( $key === HoneypotField::get_secret_name_for_post() ) {
+				$fields['plugin_field'] = $key;
+			}
 		}
 
 		if ( ! isset( $fields['plugin_field'] ) ) {