fix(Chat): include shared objects in unread count

Signed-off-by: Sanskar Soni <[email protected]>
nextcloud · Sep 5, 2024 · 813026d · 813026d
1 parent 20f4bff
commit 813026d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Chat/ChatManager.php b/lib/Chat/ChatManager.php
@@ -705,7 +705,7 @@ public function getUnreadCount(Room $chat, int $lastReadMessage): int {
 		$key = $chat->getId() . '-' . $lastReadMessage;
 		$unreadCount = $this->unreadCountCache->get($key);
 		if ($unreadCount === null) {
-			$unreadCount = $this->commentsManager->getNumberOfCommentsWithVerbsForObjectSinceComment('chat', (string)$chat->getId(), $lastReadMessage, [self::VERB_MESSAGE, 'object_shared']);
+			$unreadCount = $this->commentsManager->getNumberOfCommentsWithVerbsForObjectSinceComment('chat', (string)$chat->getId(), $lastReadMessage, [self::VERB_MESSAGE, self::VERB_OBJECT_SHARED]);
 			$this->unreadCountCache->set($key, $unreadCount, 1800);
 		}
 		return $unreadCount;

diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
@@ -1123,8 +1123,8 @@ public function markUnread(): DataResponse {
 				$previousMessage = $this->chatManager->getPreviousMessageWithVerb(
 					$this->room,
 					(int)$message->getId(),
-					[ChatManager::VERB_MESSAGE],
-					$message->getVerb() === ChatManager::VERB_MESSAGE
+					[ChatManager::VERB_MESSAGE, ChatManager::VERB_OBJECT_SHARED],
+					$message->getVerb() === ChatManager::VERB_MESSAGE || $message->getVerb() === ChatManager::VERB_OBJECT_SHARED
 				);
 				$unreadId = (int)$previousMessage->getId();
 			} catch (NotFoundException $e) {