From 2166cfde9ec1296bbdcf7d3a6cee83d2b52be853 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 26 Nov 2021 12:29:44 +0100
Subject: Allow to count comments with multiple verbs

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/private/Comments/Manager.php         | 32 ++++++++++++++++++++++++++++----
 lib/public/Comments/ICommentsManager.php | 11 +++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php
index 21caf6823f8..d62db2926fb 100644
--- a/lib/private/Comments/Manager.php
+++ b/lib/private/Comments/Manager.php
@@ -677,6 +677,10 @@ class Manager implements ICommentsManager {
 	 * @since 21.0.0
 	 */
 	public function getNumberOfCommentsForObjectSinceComment(string $objectType, string $objectId, int $lastRead, string $verb = ''): int {
+		if ($verb !== '') {
+			return $this->getNumberOfCommentsWithVerbsForObjectSinceComment($objectType, $objectId, $lastRead, [$verb]);
+		}
+
 		$query = $this->dbConn->getQueryBuilder();
 		$query->select($query->func()->count('id', 'num_messages'))
 			->from('comments')
@@ -684,11 +688,31 @@ class Manager implements ICommentsManager {
 			->andWhere($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
 			->andWhere($query->expr()->gt('id', $query->createNamedParameter($lastRead)));
 
-		if ($verb !== '') {
-			$query->andWhere($query->expr()->eq('verb', $query->createNamedParameter($verb)));
-		}
+		$result = $query->executeQuery();
+		$data = $result->fetch();
+		$result->closeCursor();
 
-		$result = $query->execute();
+		return (int) ($data['num_messages'] ?? 0);
+	}
+
+	/**
+	 * @param string $objectType
+	 * @param string $objectId
+	 * @param int $lastRead
+	 * @param string[] $verbs
+	 * @return int
+	 * @since 24.0.0
+	 */
+	public function getNumberOfCommentsWithVerbsForObjectSinceComment(string $objectType, string $objectId, int $lastRead, array $verbs): int {
+		$query = $this->dbConn->getQueryBuilder();
+		$query->select($query->func()->count('id', 'num_messages'))
+			->from('comments')
+			->where($query->expr()->eq('object_type', $query->createNamedParameter($objectType)))
+			->andWhere($query->expr()->eq('object_id', $query->createNamedParameter($objectId)))
+			->andWhere($query->expr()->gt('id', $query->createNamedParameter($lastRead)))
+			->andWhere($query->expr()->in('verb', $query->createNamedParameter($verbs, IQueryBuilder::PARAM_STR_ARRAY)));
+
+		$result = $query->executeQuery();
 		$data = $result->fetch();
 		$result->closeCursor();
 
diff --git a/lib/public/Comments/ICommentsManager.php b/lib/public/Comments/ICommentsManager.php
index 64bb98db478..9aacf028b4e 100644
--- a/lib/public/Comments/ICommentsManager.php
+++ b/lib/public/Comments/ICommentsManager.php
@@ -201,6 +201,17 @@ interface ICommentsManager {
 	 */
 	public function getNumberOfCommentsForObjectSinceComment(string $objectType, string $objectId, int $lastRead, string $verb = ''): int;
 
+
+	/**
+	 * @param string $objectType
+	 * @param string $objectId
+	 * @param int $lastRead
+	 * @param string[] $verbs
+	 * @return int
+	 * @since 24.0.0
+	 */
+	public function getNumberOfCommentsWithVerbsForObjectSinceComment(string $objectType, string $objectId, int $lastRead, array $verbs): int;
+
 	/**
 	 * @param string $objectType
 	 * @param string $objectId
-- 
cgit v1.2.3


From 03abaaaee5759e7e01e414fcbab106c7983a6221 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 5 Jan 2022 11:53:33 +0100
Subject: Fix unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/lib/Comments/FakeManager.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/lib/Comments/FakeManager.php b/tests/lib/Comments/FakeManager.php
index 2434945762c..4904fd15501 100644
--- a/tests/lib/Comments/FakeManager.php
+++ b/tests/lib/Comments/FakeManager.php
@@ -101,6 +101,10 @@ class FakeManager implements ICommentsManager {
 		return 0;
 	}
 
+	public function getNumberOfCommentsWithVerbsForObjectSinceComment(string $objectType, string $objectId, int $lastRead, array $verbs): int {
+		return 0;
+	}
+
 	public function getLastCommentBeforeDate(string $objectType, string $objectId, \DateTime $beforeDate, string $verb = ''): int {
 		return 0;
 	}
-- 
cgit v1.2.3