Updates

Author: driesvints

app/Exceptions/CannotLikeItem.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+final class CannotLikeItem extends Exception
+{
+    public static function alreadyLiked(string $item): self
+    {
+        return new self("The {$item} cannot be liked multiple times.");
+    }
+}

app/Exceptions/CannotLikeReplyMultipleTimes.php

@@ -25,7 +25,7 @@ public function latestReplies(int $amount = 5)
 
     public function deleteReplies()
     {
-        // We need to explicitly iterate over the repies and delete them
+        // We need to explicitly iterate over the replies and delete them
         // separately because all related models need to be deleted.
         foreach ($this->repliesRelation()->get() as $reply) {
             $reply->delete();

app/Exceptions/CannotLikeThreadMultipleTimes.php

@@ -136,16 +136,16 @@ public function unsubscribe(Request $request, Thread $thread)
         return redirect()->route('thread', $thread->slug());
     }
 
-    public function like(Thread $thread)
+    public function like(Request $request, Thread $thread)
     {
-        $this->dispatchNow(new LikeThread($thread, auth()->user()));
+        $this->dispatchNow(new LikeThread($thread, $request->user()));
 
         return redirect()->route('thread', $thread->slug());
     }
 
-    public function unlike(Thread $thread)
+    public function unlike(Request $request, Thread $thread)
     {
-        $this->dispatchNow(new UnlikeThread($thread, auth()->user()));
+        $this->dispatchNow(new UnlikeThread($thread, $request->user()));
 
         return redirect()->route('thread', $thread->slug());
     }

app/Helpers/ReceivesReplies.php

@@ -16,6 +16,7 @@
 use App\Policies\ReplyPolicy;
 use Illuminate\Auth\Middleware\Authenticate;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 
 class ReplyController extends Controller
 {
@@ -64,17 +65,17 @@ public function delete(Reply $reply)
         return $this->redirectToReplyAble($reply->replyAble());
     }
 
-    public function like(Reply $reply)
+    public function like(Request $request, Reply $reply)
     {
-        $this->dispatchNow(new LikeReply($reply, auth()->user()));
+        $this->dispatchNow(new LikeReply($reply, $request->user()));
 
         return redirect()
             ->to(route('thread', $reply->replyAble()->slug())."#{$reply->id}");
     }
 
-    public function unlike(Reply $reply)
+    public function unlike(Request $request, Reply $reply)
     {
-        $this->dispatchNow(new UnlikeReply($reply, auth()->user()));
+        $this->dispatchNow(new UnlikeReply($reply, $request->user()));
 
         return redirect()
             ->to(route('thread', $reply->replyAble()->slug())."#{$reply->id}");

app/Http/Controllers/Forum/ThreadsController.php

@@ -2,11 +2,11 @@
 
 namespace App\Jobs;
 
-use App\Exceptions\CannotLikeReplyMultipleTimes;
+use App\Exceptions\CannotLikeItem;
 use App\Models\Reply;
 use App\User;
 
-class LikeReply
+final class LikeReply
 {
     /**
      * @var \App\Models\Reply
@@ -18,28 +18,19 @@ class LikeReply
      */
     private $user;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param \App\Models\Reply $reply
-     * @param \App\User $user
-     */
     public function __construct(Reply $reply, User $user)
     {
         $this->reply = $reply;
         $this->user = $user;
     }
 
     /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \App\Exceptions\CannotLikeReplyMultipleTimes
+     * @throws \App\Exceptions\CannotLikeItem
      */
-    public function handle()
+    public function handle(): void
     {
         if ($this->reply->isLikedBy($this->user)) {
-            throw new CannotLikeReplyMultipleTimes();
+            throw CannotLikeItem::alreadyLiked('reply');
         }
 
         $this->reply->likedBy($this->user);

app/Http/Controllers/ReplyController.php

@@ -2,11 +2,11 @@
 
 namespace App\Jobs;
 
-use App\Exceptions\CannotLikeThreadMultipleTimes;
+use App\Exceptions\CannotLikeItem;
 use App\Models\Thread;
 use App\User;
 
-class LikeThread
+final class LikeThread
 {
     /**
      * @var \App\Models\Thread
@@ -18,28 +18,19 @@ class LikeThread
      */
     private $user;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param \App\Models\Thread $thread
-     * @param \App\User $user
-     */
     public function __construct(Thread $thread, User $user)
     {
         $this->thread = $thread;
         $this->user = $user;
     }
 
     /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \App\Exceptions\CannotLikeThreadMultipleTimes
+     * @throws \App\Exceptions\CannotLikeItem
      */
-    public function handle()
+    public function handle(): void
     {
         if ($this->thread->isLikedBy($this->user)) {
-            throw new CannotLikeThreadMultipleTimes();
+            throw CannotLikeItem::alreadyLiked('thread');
         }
 
         $this->thread->likedBy($this->user);

app/Jobs/LikeReply.php

@@ -5,7 +5,7 @@
 use App\Models\Reply;
 use App\User;
 
-class UnlikeReply
+final class UnlikeReply
 {
     /**
      * @var \App\Models\Reply
@@ -17,24 +17,13 @@ class UnlikeReply
      */
     private $user;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param \App\Models\Reply $reply
-     * @param \App\User $user
-     */
     public function __construct(Reply $reply, User $user)
     {
         $this->reply = $reply;
         $this->user = $user;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
+    public function handle(): void
     {
         $this->reply->dislikedBy($this->user);
     }

app/Jobs/LikeThread.php

@@ -5,7 +5,7 @@
 use App\Models\Thread;
 use App\User;
 
-class UnlikeThread
+final class UnlikeThread
 {
     /**
      * @var \App\Models\Thread
@@ -17,24 +17,13 @@ class UnlikeThread
      */
     private $user;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param \App\Models\Thread $thread
-     * @param \App\User $user
-     */
     public function __construct(Thread $thread, User $user)
     {
         $this->thread = $thread;
         $this->user = $user;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
+    public function handle(): void
     {
         $this->thread->dislikedBy($this->user);
     }