Merge pull request #73 from MetaFilter/70-fix-comment-count

Fix comment count to match # of comments

Author: csebianlander

app/Livewire/Posts/PostIndexItemComponent.php

@@ -21,7 +21,7 @@ public function mount(Post $post): void
     {
         $this->authorizedUserId = $this->getAuthorizedUserId();
         $this->post = $post;
-        $this->commentCount = $post->comments()->count();
+        $this->commentCount = $post->commentsCount();
     }
 
     public function render(): View

app/Models/Post.php

@@ -143,6 +143,12 @@ public function comments(): HasMany
         return $this->hasMany(Comment::class);
     }
 
+    public function commentsCount(): int
+    {
+        // Only count comments by regular users, not moderator actions
+        return $this->hasMany(Comment::class)->whereNull('moderation_type')->count();
+    }
+
     public function bookmarkCount(): int
     {
         return Bookmark::count($this);

resources/views/posts/partials/post-index-footer.blade.php

@@ -9,6 +9,6 @@
         href="{{ $post->present()->url }}#comments"
         title="{{ trans('Comments') }}">
         <x-icons.icon-component filename="chat" />
-        {{ $post->comments()->count() > 0 ?: 0 }}
+        {{ $post->commentsCount() }}
     </a>
 </footer>

resources/views/posts/partials/post-show-footer.blade.php

@@ -15,7 +15,7 @@
 
     <span>
         <x-icons.icon-component filename="chat" />
-        {{ $commentsCount > 0 ?: 0 }}
+        {{ $commentsCount }}
     </span>
 
     @if (isset($favoritesCount) && $favoritesCount > 0)

resources/views/posts/show.blade.php

@@ -42,7 +42,7 @@
 
         @include('posts.partials.post-show-footer', [
             'post' => $post,
-            'commentsCount' => $post->comments()->count(),
+            'commentsCount' => $post->commentsCount(),
             'favoritesCount' => $post->favoriteCount(),
         ])
     </article>