fix: filter unverified comments in panel and notifications

Author: mauricerenck

lib/KommentModeration.php

@@ -8,9 +8,10 @@ class KommentModeration
 {
     private $storage;
 
-    public function __construct(private ?string $storageType = null)
+    public function __construct(private ?string $storageType = null, private ?bool $filterUnverified = null,)
     {
         $this->storage = StorageFactory::create($storageType);
+        $this->filterUnverified = $filterUnverified ?? option('mauricerenck.komments.spam.verification.filterUnverfied', true);
     }
 
     public function getComment(string $id): mixed
@@ -135,7 +136,10 @@ public function replyToComment(string $id, array $formData)
     public function getPendingComments(?bool $published = false, ?string $type = null): mixed
     {
         $comments = $this->storage->getCommentsOfSite();
-        $filteredComments = $comments->filterBy('published', $published)->sortBy('updatedAt', 'desc');
+        $filters = $this->filterUnverified ? 'VERIFIED' : 'PENDING';
+        $filters = $published ? 'PUBLISHED' : $filters;
+
+        $filteredComments = $comments->filterBy('verification_status', $filters)->sortBy('updatedAt', 'desc');
 
         if ($type) {
             $filteredComments = $filteredComments->filterBy('type', $type);

lib/KommentReceiver.php

@@ -17,9 +17,6 @@ public function __construct(
         private ?bool $debug = null,
         private ?array $spamKeywords = null,
         private ?array $spamPhrases = null,
-        private ?bool $verificationEnabled = null,
-        private ?bool $verificationTtl = null,
-        private ?bool $verificationSecret = null
     ) {
         $this->autoPublish = $autoPublish ?? option('mauricerenck.komments.moderation.autoPublish', []);
         $this->autoPublishVerified = $autoPublishVerified ?? option('mauricerenck.komments.moderation.publish-verified', false);

site/config/config.php

@@ -47,6 +47,7 @@
                 'delete' => false,
                 'verification' => [
                     'enabled' => true,
+                    'filterUnverfied' => true,
                     'ttl' => 1,
                     'secret' => 'my-extremly-secure-secret',
                     'autoPublish' => false,

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'mauricerenck/komments',
-        'pretty_version' => '3.7.1',
-        'version' => '3.7.1.0',
+        'pretty_version' => '3.7.3',
+        'version' => '3.7.3.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -29,8 +29,8 @@
             'dev_requirement' => false,
         ),
         'mauricerenck/komments' => array(
-            'pretty_version' => '3.7.1',
-            'version' => '3.7.1.0',
+            'pretty_version' => '3.7.3',
+            'version' => '3.7.3.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',