From beb040150005cea6856ed77238b72b07aeb535b8 Mon Sep 17 00:00:00 2001
From: Kazuki Shimizu <kazuki43zoo@gmail.com>
Date: Mon, 28 May 2018 22:58:34 +0900
Subject: [PATCH] Count multiple comments on the same line See #2015

---
 src/main/twirl/gitbucket/core/pulls/menu.scala.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/twirl/gitbucket/core/pulls/menu.scala.html b/src/main/twirl/gitbucket/core/pulls/menu.scala.html
index caa07f5bd..7381e58bb 100644
--- a/src/main/twirl/gitbucket/core/pulls/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/menu.scala.html
@@ -122,5 +122,8 @@
 </script>
 
 @countConversation(comments: Seq[Comment]) = @{
-  comments.count(c => c.isInstanceOf[CommitComments] || c.asInstanceOf[IssueComment].action.endsWith("comment"))
+  comments.collect {
+    case c: CommitComments => c.comments.size
+    case c: IssueComment if c.action.endsWith("comment") => 1
+  }.sum
 }