Add some missing events and clean up post.card component

Author: Riari

src/Events/UserBulkManagedCategories.php renamed to src/Events/UserBulkReorderedCategories.php

@@ -4,7 +4,7 @@
 
 use TeamTeaTime\Forum\Events\Types\BaseEvent;
 
-class UserBulkManagedCategories extends BaseEvent
+class UserBulkReorderedCategories extends BaseEvent
 {
     /** @var mixed */
     public $user;

src/Events/UserManagingCategories.php renamed to src/Events/UserReorderingCategories.php

@@ -4,7 +4,7 @@
 
 use TeamTeaTime\Forum\Events\Types\BaseEvent;
 
-class UserManagingCategories extends BaseEvent
+class UserReorderingCategories extends BaseEvent
 {
     /** @var mixed */
     public $user;

src/Http/Livewire/Pages/CategoryCreate.php

@@ -50,9 +50,7 @@ public function mount(Request $request)
             $this->parent_category = $this->parent_id;
         }
 
-        if ($request->user() !== null) {
-            UserCreatingCategory::dispatch($request->user());
-        }
+        UserCreatingCategory::dispatch($request->user());
     }
 
     public function create(Request $request)

src/Http/Livewire/Pages/CategoryEdit.php

@@ -10,6 +10,7 @@
 use Livewire\Component;
 use TeamTeaTime\Forum\{
     Actions\EditCategory,
+    Events\UserDeletedCategory,
     Events\UserEditingCategory,
     Events\UserEditedCategory,
     Models\Category,
@@ -54,9 +55,7 @@ public function mount(Request $request)
         $this->accepts_threads = $category->accepts_threads;
         $this->is_private = $category->is_private;
 
-        if ($request->user() !== null) {
-            UserEditingCategory::dispatch($request->user(), $category);
-        }
+        UserEditingCategory::dispatch($request->user(), $category);
     }
 
     public function save(Request $request)
@@ -88,6 +87,8 @@ public function delete(Request $request)
 
         $this->category->delete();
 
+        UserDeletedCategory::dispatch($request->user(), $this->category);
+
         return $this->redirect(Forum::route('category.index'));
     }
 

src/Http/Livewire/Pages/CategoryShow.php

@@ -17,6 +17,7 @@
     Actions\Bulk\UnpinThreads,
     Events\UserBulkDeletedThreads,
     Events\UserBulkLockedThreads,
+    Events\UserBulkMovedThreads,
     Events\UserBulkPinnedThreads,
     Events\UserBulkRestoredThreads,
     Events\UserBulkUnlockedThreads,
@@ -121,6 +122,10 @@ public function moveThreads(Request $request, array $threadIds, int $destination
         $action = new MoveThreads($threadIds, $destination, $request->user()->can('viewTrashedThreads'));
         $result = $action->execute();
 
+        if ($result !== null) {
+            UserBulkMovedThreads::dispatch($request->user(), $result);
+        }
+
         return $this->handleActionResult($result);
     }
 

src/Http/Livewire/Pages/PostEdit.php

@@ -35,9 +35,7 @@ public function mount(Request $request)
             abort(404);
         }
 
-        if ($request->user() !== null) {
-            UserEditingPost::dispatch($request->user(), $request->route('post'));
-        }
+        UserEditingPost::dispatch($request->user(), $request->route('post'));
     }
 
     public function save(Request $request)
@@ -53,8 +51,6 @@ public function save(Request $request)
 
         UserEditedPost::dispatch($request->user(), $post);
 
-        $route = $post->route;
-
         return $this->redirect($post->route);
     }
 

src/Http/Livewire/Pages/ThreadCreate.php

@@ -9,6 +9,7 @@
 use Livewire\Component;
 use TeamTeaTime\Forum\{
     Actions\CreateThread as Action,
+    Events\UserCreatingThread,
     Events\UserCreatedThread,
     Support\Authorization\CategoryAuthorization,
     Support\Validation\ThreadRules,
@@ -30,6 +31,8 @@ public function mount(Request $request)
     {
         $this->category = $request->route('category');
         $this->breadcrumbs_append = [trans('forum::threads.new_thread')];
+
+        UserCreatingThread::dispatch($request->user(), $this->category);
     }
 
     public function create(Request $request)

src/Http/Livewire/Pages/ThreadReply.php

@@ -8,14 +8,12 @@
 use Livewire\Attributes\Locked;
 use Livewire\Component;
 use TeamTeaTime\Forum\{
-    Actions\CreatePost as Action,
-    Events\UserCreatedPost,
     Events\UserCreatingPost,
+    Http\Livewire\Forms\ThreadReplyForm,
     Http\Livewire\Traits\CreatesAlerts,
     Http\Livewire\Traits\UpdatesContent,
     Models\Post,
     Models\Thread,
-    Support\Validation\PostRules,
 };
 
 class ThreadReply extends Component
@@ -28,8 +26,7 @@ class ThreadReply extends Component
     #[Locked]
     public ?Post $parent = null;
 
-    // Form fields
-    public string $content = '';
+    public ThreadReplyForm $form;
 
     public function mount(Request $request)
     {
@@ -43,26 +40,12 @@ public function mount(Request $request)
             $this->parent = $this->thread->posts->find($request->input('parent_id'));
         }
 
-        if ($request->user() !== null) {
-            UserCreatingPost::dispatch($request->user(), $this->thread);
-        }
+        UserCreatingPost::dispatch($request->user(), $this->thread);
     }
 
     public function reply(Request $request)
     {
-        if (!$request->user()->can('reply', $this->thread)) {
-            abort(403);
-        }
-
-        $validated = $this->validate(PostRules::create());
-        $action = new Action($this->thread, $this->parent, $request->user(), $validated['content']);
-        $post = $action->execute();
-
-        $post->thread->markAsRead($request->user());
-
-        UserCreatedPost::dispatch($request->user(), $post);
-
-        $this->content = "";
+        $post = $this->threadReplyForm->reply($request, $this->thread);
 
         return redirect($post->route);
     }

src/Http/Livewire/Pages/ThreadShow.php

@@ -8,6 +8,8 @@
 use TeamTeaTime\Forum\{
     Actions\Bulk\DeletePosts,
     Actions\Bulk\RestorePosts,
+    Events\UserBulkDeletedPosts,
+    Events\UserBulkRestoredPosts,
     Events\UserViewingThread,
     Http\Livewire\Forms\ThreadEditForm,
     Http\Livewire\Forms\ThreadReplyForm,
@@ -18,7 +20,6 @@
     Models\Thread,
     Support\Access\CategoryAccess,
     Support\Authorization\PostAuthorization,
-    Support\Validation\PostRules,
     Support\Traits\HandlesDeletion,
 };
 
@@ -130,11 +131,15 @@ public function deletePosts(Request $request, array $postIds, bool $permadelete)
         }
 
         $action = new DeletePosts($postIds, $this->shouldPermaDelete($permadelete));
-        $action->execute();
+        $result = $action->execute();
 
         $this->touchUpdateKey();
 
-        return $this->pluralAlert('threads.deleted')->toLivewire();
+        if ($result !== null) {
+            UserBulkDeletedPosts::dispatch($request->user(), $result);
+        }
+
+        return $this->pluralAlert('posts.deleted', $result->count())->toLivewire();
     }
 
     public function restorePosts(Request $request, array $postIds): array
@@ -144,11 +149,15 @@ public function restorePosts(Request $request, array $postIds): array
         }
 
         $action = new RestorePosts($postIds);
-        $action->execute();
+        $result = $action->execute();
 
         $this->touchUpdateKey();
 
-        return $this->pluralAlert('threads.restored')->toLivewire();
+        if ($result !== null) {
+            UserBulkRestoredPosts::dispatch($request->user(), $result);
+        }
+
+        return $this->pluralAlert('posts.restored', $result->count())->toLivewire();
     }
 
     public function render(Request $request): View

src/Http/Livewire/Pages/UnreadThreads.php

@@ -8,6 +8,7 @@
 use Illuminate\View\View;
 use Livewire\Component;
 use TeamTeaTime\Forum\{
+    Events\UserMarkedThreadsAsRead,
     Events\UserViewingUnread,
     Http\Livewire\Traits\CreatesAlerts,
     Http\Livewire\Traits\UpdatesContent,
@@ -47,16 +48,16 @@ public function markAsRead(Request $request): array
 
         $this->touchUpdateKey();
 
+        UserMarkedThreadsAsRead::dispatch($request->user(), $threads);
+
         return $this->alert('threads.marked_read')->toLivewire();
     }
 
     public function render(Request $request): View
     {
         $threads = $this->getThreads($request);
 
-        if ($request->user() !== null) {
-            UserViewingUnread::dispatch($request->user(), $threads);
-        }
+        UserViewingUnread::dispatch($request->user(), $threads);
 
         return ViewFactory::make('forum::pages.thread.unread', [
             'threads' => $threads,