fix: hard delete options not working

FriendsOfFlarum · Nov 20, 2023 · 8b036ee · 8b036ee
1 parent e321eb3
commit 8b036ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/js/src/forum/components/HandleSpammerModal.tsx b/js/src/forum/components/HandleSpammerModal.tsx
@@ -123,9 +123,9 @@ export default class HandleSpammerModal extends Modal<HandleSpammerModalAttrs> {
 
     const body = {
       options: {
-        hardDeletePosts: this.hardDeletePosts,
-        hardDeleteDiscussions: this.hardDeleteDiscussions,
-        hardDeleteUser: this.hardDeleteUser,
+        deletePosts: this.hardDeletePosts,
+        deleteDiscussions: this.hardDeleteDiscussions,
+        deleteUser: this.hardDeleteUser,
         moveDiscussionsToQuarantine: this.moveDiscussionsToQuarantine,
         reportToSfs: this.reportToSfs,
       },

diff --git a/src/Command/MarkUserAsSpammerHandler.php b/src/Command/MarkUserAsSpammerHandler.php
@@ -80,7 +80,7 @@ public function __construct(ExtensionManager $extensions, Bus $bus, Events $even
         $this->log = $log;
     }
 
-    public function handle(MarkUserAsSpammer $command): void
+    public function handle(MarkUserAsSpammer $command): User
     {
         $user = $command->user;
         $actor = $command->actor ?? new Guest();
@@ -91,12 +91,14 @@ public function handle(MarkUserAsSpammer $command): void
 
         $this->handleDiscussions($user, $actor);
 
-        $this->handleUser($user, $actor);
         $this->handlePosts($user, $actor);
+        $this->handleUser($user, $actor);
 
         $this->events->dispatch(
             new MarkedUserAsSpammer($user, $actor)
         );
+
+        return $command->user->refresh();
     }
 
     protected function parseOptions(array $options): void
@@ -115,13 +117,6 @@ protected function shouldMoveToQuarantineSetting(): bool
         return ($value === null || $value === '[]') ? false : true;
     }
 
-    protected function getQuanrantineTags(): object
-    {
-        $value = $this->settings->get(self::settings_prefix.'moveDiscussionsToTags');
-
-        return json_decode($value);
-    }
-
     protected function flagsEnabled(): bool
     {
         return $this->extensions->isEnabled('flarum-flags');
@@ -154,6 +149,9 @@ protected function handleUser(User $user, User $actor): void
                 'actor' => $actor->id,
             ]);
         }
+
+        $user->refreshDiscussionCount();
+        $user->refreshCommentCount();
     }
 
     /**