Fix for Talk-Widget direct mentions

- Get last unread mention message using last unread mention id - Only direct mentions are displayed in Talk-Widget
nextcloud · Mar 25, 2024 · fc2d96a · fc2d96a
1 parent d32c3f4
commit fc2d96a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
@@ -1947,4 +1947,21 @@ public function getParticipantByActor(Room $room, string $actorType, string $act
 		$this->cacheParticipant($room, $participant);
 		return $participant;
 	}
+
+	/**
+	 * @param int $mentionId
+	 * @return string
+	 */
+	public function getLastUnreadMentionMessage(int $mentionId)
+	{
+		$query = $this->connection->getQueryBuilder();
+		$query->select('c.message')
+			->from('comments', 'c')
+			->where('c.id = :mentionId')
+			->setParameter('mentionId', $mentionId)
+			->setMaxResults(1);
+
+		$result = $query->executeQuery();
+		return $result->fetchOne();
+	}
 }
diff --git a/lib/Service/RoomFormatter.php b/lib/Service/RoomFormatter.php
@@ -157,6 +157,7 @@ public function formatRoomV4(
 			'breakoutRoomMode' => BreakoutRoom::MODE_NOT_CONFIGURED,
 			'breakoutRoomStatus' => BreakoutRoom::STATUS_STOPPED,
 			'recordingConsent' => $this->talkConfig->recordingConsentRequired() === RecordingService::CONSENT_REQUIRED_OPTIONAL ? $room->getRecordingConsent() : $this->talkConfig->recordingConsentRequired(),
+			'lastUnreadMentionMessage' => '',
 		];
 
 		$lastActivity = $room->getLastActivity();
@@ -319,6 +320,7 @@ public function formatRoomV4(
 				$lastMentionDirect = $attendee->getLastMentionDirect();
 				$roomData['unreadMention'] = $lastMention !== 0 && $lastReadMessage < $lastMention;
 				$roomData['unreadMentionDirect'] = $lastMentionDirect !== 0 && $lastReadMessage < $lastMentionDirect;
+				$roomData['lastUnreadMentionMessage'] = ($lastMentionDirect !== 0 or $lastMentionDirect !== null) ? $this->participantService->getLastUnreadMentionMessage($lastMentionDirect) : '';
 				$roomData['lastReadMessage'] = $lastReadMessage;
 
 				$roomData['canDeleteConversation'] = $room->getType() !== Room::TYPE_ONE_TO_ONE

diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
@@ -148,8 +148,8 @@ export default {
 					return t('spreed', 'Call in progress')
 				}
 
-				if (conversation.unreadMention) {
-					return t('spreed', 'You were mentioned')
+				if (conversation.unreadMentionDirect) {
+					return t('spreed', conversation.lastUnreadMentionMessage)
 				}
 
 				return this.simpleLastChatMessage(conversation.lastMessage)
@@ -188,7 +188,7 @@ export default {
 				const rooms = allRooms.filter((conversation) => conversation.objectType !== CONVERSATION.OBJECT_TYPE.BREAKOUT_ROOM)
 				const importantRooms = rooms.filter((conversation) => {
 					return conversation.hasCall
-						|| conversation.unreadMention
+						|| conversation.unreadMentionDirect
 						|| (conversation.unreadMessages > 0 && (conversation.type === CONVERSATION.TYPE.ONE_TO_ONE || conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER))
 				})