Fix. TRP. Correctly save TRP hashes. Do not set hashes only if license is inactive or manual moderation is force enabled in WP settings.

Author: alexandergull

inc/cleantalk-public.php

@@ -1009,20 +1009,6 @@ function ct_set_approved($approved, $_comment)
     return 1;
 }
 
-/**
- * Public action 'comment_post' - Store cleantalk hash in comment meta
- *
- * @psalm-suppress UnusedParam
- * @return void
- */
-function ct_set_real_user_badge_automod_hash($comment_id)
-{
-    $hash1 = ct_hash();
-    if ( ! empty($hash1) ) {
-        update_comment_meta($comment_id, 'ct_real_user_badge_automod_hash', ct_hash());
-    }
-}
-
 /**
  * Public filter 'pre_comment_approved' - Mark comment unapproved always
  * @return    string

lib/Cleantalk/Antispam/Integrations/CleantalkPreprocessComment.php

@@ -2,6 +2,7 @@
 
 namespace Cleantalk\Antispam\Integrations;
 
+use Cleantalk\ApbctWP\CleantalkRealPerson;
 use Cleantalk\ApbctWP\Sanitize;
 use Cleantalk\ApbctWP\Variables\AltSessions;
 use Cleantalk\ApbctWP\Variables\Cookie;
@@ -259,6 +260,7 @@ public function allow()
             } else {
                 $this->setCommentPreStatusAndModifyEmail('not_approved');
             }
+            $this->addActionSetTRPHash();
             return;
         }
 
@@ -271,6 +273,7 @@ public function allow()
                 !$is_allowed_because_of_inactive_license
             ) {
                 $this->setCommentPreStatusAndModifyEmail('approved');
+                $this->addActionSetTRPHash();
             } else {
                 // moderation disabled - standard WP check
                 if (
@@ -280,6 +283,7 @@ public function allow()
                 } else {
                     $this->setCommentPreStatusAndModifyEmail('not_approved');
                 }
+                // thi is the only case when we do not set TRP hash!
             }
         } else {
             //not new author - standard WP check
@@ -290,9 +294,18 @@ public function allow()
             } else {
                 $this->setCommentPreStatusAndModifyEmail('not_approved');
             }
+            $this->addActionSetTRPHash();
         }
     }
 
+    /**
+     * TRP hash should be set anyway if Cleantalk processed.
+     */
+    private function addActionSetTRPHash()
+    {
+        add_action('comment_post', array(CleantalkRealPerson::class, 'setTRPHash'), 999, 2);
+    }
+
     public function doBlock($message)
     {
         $ct_result = $this->base_call_result['ct_result'];
@@ -536,24 +549,20 @@ private function rerunWPcheckCommentFunction()
         return $check_result;
     }
 
+    /**
+     * @param $status
+     *
+     * @return void
+     */
     private function setCommentPreStatusAndModifyEmail($status)
     {
         if ($status !== 'approved' && $status !== 'not_approved') {
             return;
         }
-        if ( $status === 'approved' ) {
-            add_filter('pre_comment_approved', 'ct_set_approved', 999, 2);
-
-            // Always set hash for auto-moderated (approved) comments if cleantalk_allowed_moderation is enabled
-            if (
-                !empty($this->apbct->settings['cleantalk_allowed_moderation']) &&
-                $this->apbct->settings['cleantalk_allowed_moderation'] == '1'
-            ) {
-                add_action('comment_post', 'ct_set_real_user_badge_automod_hash', 999, 2);
-            }
-        } else {
-            add_filter('pre_comment_approved', 'ct_set_not_approved', 999, 2);
-        }
+        $pre_comment_approved_callback_function = $status === 'approved'
+            ? 'ct_set_approved'
+            : 'ct_set_not_approved';
+        add_filter('pre_comment_approved', $pre_comment_approved_callback_function, 999, 2);
 
         // Modify the email notification
         add_filter(

lib/Cleantalk/ApbctWP/CleantalkRealPerson.php

@@ -4,6 +4,8 @@
 
 class CleantalkRealPerson
 {
+    public static $meta_hash_name__old = 'ct_real_user_badge_hash';
+    public static $meta_hash_name__automod = 'ct_real_user_badge_automod_hash';
     public static function getLocalizingData()
     {
         /** @psalm-suppress PossiblyUndefinedVariable */
@@ -43,21 +45,56 @@ public function publicCommentAddTrpClass($classes, $_css_class, $comment_id, $co
         // Logic for show TRP badge
         $show_trp = false;
         $the_real_person = !empty($apbct->settings['comments__the_real_person']) && $apbct->settings['comments__the_real_person'] == '1';
-        $allowed_moderation = !empty($apbct->settings['cleantalk_allowed_moderation']) && $apbct->settings['cleantalk_allowed_moderation'] == '1';
+        $show_trp = $the_real_person && self::isTRPHashExist($comment_id) && $comment->comment_author;
 
-        if ($the_real_person && $allowed_moderation) {
+        if ($show_trp || $show_trp_on_roles) {
+            $classes[] = 'apbct-trp';
+        }
+        return $classes;
+    }
+
+    /**
+     * @return bool
+     */
+    private static function isAutomodEnabled()
+    {
+        global $apbct;
+        return !empty($apbct->settings['cleantalk_allowed_moderation']) && $apbct->settings['cleantalk_allowed_moderation'] == '1';
+    }
+
+    /**
+     * Check if TRP hash is saved for comment ID. Autodetect if cleantalk_allowed_moderation is enabled.
+     * @param int|string $comment_id
+     * @return bool
+     */
+    public static function isTRPHashExist($comment_id)
+    {
+        if (self::isAutomodEnabled()) {
             // Only for auto-moderated
-            $automod_hash = get_comment_meta((int)$comment_id, 'ct_real_user_badge_automod_hash', true);
-            $show_trp = $automod_hash && $comment->comment_author;
-        } elseif ($the_real_person && !$allowed_moderation) {
+            $trp_hash = get_comment_meta((int)$comment_id, self::$meta_hash_name__automod, true);
+        } else {
             // Only for old
-            $old_hash = get_comment_meta((int)$comment_id, 'ct_real_user_badge_hash', true);
-            $show_trp = $old_hash && $comment->comment_author;
+            $trp_hash = get_comment_meta((int)$comment_id, self::$meta_hash_name__old, true);
         }
 
-        if ($show_trp || $show_trp_on_roles) {
-            $classes[] = 'apbct-trp';
+        return !empty($trp_hash);
+    }
+
+    /**
+     * Save TRP hash for comment ID. Autodetect if cleantalk_allowed_moderation is enabled.
+     * @param int|string $comment_id
+     *
+     * @return void
+     */
+    public static function setTRPHash($comment_id)
+    {
+        $hash = ct_hash();
+        if ( ! empty($hash) ) {
+            if (self::isAutomodEnabled()) {
+                update_comment_meta((int)$comment_id, self::$meta_hash_name__automod, $hash);
+            } else {
+                update_comment_meta((int)$comment_id, self::$meta_hash_name__old, $hash);
+            }
         }
-        return $classes;
     }
 }