fixes

usamamuneerchaudhary · Apr 5, 2023 · 046ee70 · 046ee70
1 parent 15268c0
commit 046ee70
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/config/commentify.php b/config/commentify.php
@@ -3,6 +3,6 @@
 return [
     'users_route_prefix' => 'users', //set this prefix to anything that you wish to use for users profile routes
     'pagination_count' => 10,
-    'css_framework' => 'tailwind', // or 'bootstrap' //TODO
+    'css_framework' => 'tailwind', // or 'bootstrap'
 
 ];
diff --git a/src/Http/Livewire/Like.php b/src/Http/Livewire/Like.php
@@ -23,6 +23,8 @@ public function mount(\Usamamuneerchaudhary\Commentify\Models\Comment $comment):
 
     public function like(): void
     {
+        $ip = request()->ip();
+        $userAgent = request()->userAgent();
         if ($this->comment->isLiked()) {
             $this->comment->removeLike();
 
@@ -33,7 +35,7 @@ public function like(): void
             ]);
 
             $this->count++;
-        } elseif (($ip = request()->ip()) && ($userAgent = request()->userAgent())) {
+        } elseif ($ip && $userAgent) {
             $this->comment->likes()->create([
                 'ip' => $ip,
                 'user_agent' => $userAgent,

diff --git a/src/Scopes/HasLikes.php b/src/Scopes/HasLikes.php
@@ -21,13 +21,15 @@ public function likes(): HasMany
      */
     public function isLiked(): bool|int
     {
+        $ip = request()->ip();
+        $userAgent = request()->userAgent();
         if (auth()->user()) {
             return User::with('likes')->whereHas('likes', function ($q) {
                 $q->where('comment_id', $this->id);
             })->count();
         }
 
-        if (($ip = request()->ip()) && ($userAgent = request()->userAgent())) {
+        if ($ip && $userAgent) {
             return $this->likes()->forIp($ip)->forUserAgent($userAgent)->count();
         }
 
@@ -39,11 +41,13 @@ public function isLiked(): bool|int
      */
     public function removeLike(): bool
     {
+        $ip = request()->ip();
+        $userAgent = request()->userAgent();
         if (auth()->user()) {
             return $this->likes()->where('user_id', auth()->user()->id)->where('comment_id', $this->id)->delete();
         }
-
-        if (($ip = request()->ip()) && ($userAgent = request()->userAgent())) {
+        
+        if ($ip && $userAgent) {
             return $this->likes()->forIp($ip)->forUserAgent($userAgent)->delete();
         }