Revert "fix: Implement PostWasUnapproved event for all unapproved pos…

…ts, hiding discussions for unapproved initial posts"

This reverts commit 3bbd1f7.

extensions/akismet/extend.php

@@ -10,8 +10,8 @@
 use Flarum\Akismet\Listener;
 use Flarum\Akismet\Provider\AkismetProvider;
 use Flarum\Approval\Event\PostWasApproved;
-use Flarum\Approval\Event\PostWasUnapproved;
 use Flarum\Extend;
+use Flarum\Post\Event\Hidden;
 use Flarum\Post\Event\Saving;
 use Flarum\Post\Post;
 
@@ -25,7 +25,7 @@
     new Extend\Locales(__DIR__.'/locale'),
 
     (new Extend\Event())
-        ->listen(PostWasUnapproved::class, Listener\SubmitSpam::class)
+        ->listen(Hidden::class, Listener\SubmitSpam::class)
         ->listen(PostWasApproved::class, Listener\SubmitHam::class)
         ->listen(Saving::class, Listener\ValidatePost::class),
 

extensions/akismet/src/Listener/SubmitSpam.php

@@ -10,7 +10,7 @@
 namespace Flarum\Akismet\Listener;
 
 use Flarum\Akismet\Akismet;
-use Flarum\Approval\Event\PostWasUnapproved;
+use Flarum\Post\Event\Hidden;
 
 class SubmitSpam
 {
@@ -24,7 +24,7 @@ public function __construct(Akismet $akismet)
         $this->akismet = $akismet;
     }
 
-    public function handle(PostWasUnapproved $event)
+    public function handle(Hidden $event)
     {
         if (! $this->akismet->isConfigured()) {
             return;

extensions/approval/extend.php

@@ -11,7 +11,6 @@
 use Flarum\Api\Serializer\PostSerializer;
 use Flarum\Approval\Access;
 use Flarum\Approval\Event\PostWasApproved;
-use Flarum\Approval\Event\PostWasUnapproved;
 use Flarum\Approval\Listener;
 use Flarum\Discussion\Discussion;
 use Flarum\Extend;
@@ -53,7 +52,6 @@
 
     (new Extend\Event())
         ->listen(PostWasApproved::class, Listener\UpdateDiscussionAfterPostApproval::class)
-        ->listen(PostWasUnapproved::class, Listener\UpdateDiscussionAfterPostUnapproval::class)
         ->subscribe(Listener\ApproveContent::class)
         ->subscribe(Listener\UnapproveNewContent::class),
 

extensions/approval/src/Listener/ApproveContent.php

@@ -10,7 +10,6 @@
 namespace Flarum\Approval\Listener;
 
 use Flarum\Approval\Event\PostWasApproved;
-use Flarum\Approval\Event\PostWasUnapproved;
 use Flarum\Post\Event\Saving;
 use Illuminate\Contracts\Events\Dispatcher;
 
@@ -38,13 +37,10 @@ public function approvePost(Saving $event)
         }
 
         if (! empty($isApproved)) {
-            // Set the post's approval status to true to clear any pending approval status, even if the post is hidden.
             $post->is_approved = true;
 
             if(! $post->hidden_at) {
                 $post->raise(new PostWasApproved($post, $event->actor));
-            } else {
-                $post->raise(new PostWasUnapproved($post, $event->actor));
             }
         }
     }

extensions/approval/src/Listener/UpdateDiscussionAfterPostApproval.php

@@ -10,22 +10,36 @@
 namespace Flarum\Approval\Listener;
 
 use Flarum\Approval\Event\PostWasApproved;
-use Flarum\Approval\RefreshesDiscussionTrait;
 
 class UpdateDiscussionAfterPostApproval
 {
-    use RefreshesDiscussionTrait;
-
     public function handle(PostWasApproved $event)
     {
-        $this->refreshAndSaveDiscussion($event->post, function ($post, $discussion, $user) {
-            if ($post->number === 1) {
-                $discussion->is_approved = true;
-
-                $discussion->afterSave(function () use ($user) {
-                    $user->refreshDiscussionCount();
-                });
-            }
-        });
+        $post = $event->post;
+        $discussion = $post->discussion;
+        $user = $discussion->user;
+
+        $discussion->refreshCommentCount();
+        $discussion->refreshLastPost();
+
+        if ($post->number === 1) {
+            $discussion->is_approved = true;
+
+            $discussion->afterSave(function () use ($user) {
+                $user->refreshDiscussionCount();
+            });
+        }
+
+        $discussion->save();
+
+        if ($discussion->user) {
+            $user->refreshCommentCount();
+            $user->save();
+        }
+
+        if ($post->user) {
+            $post->user->refreshCommentCount();
+            $post->user->save();
+        }
     }
 }