Added checks for expired/deleted message

Also added parsing of mention message correctly
nextcloud · Mar 27, 2024 · 68d6f14 · 68d6f14
1 parent 4aa4dd0
commit 68d6f14
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/Dashboard/TalkWidget.php b/lib/Dashboard/TalkWidget.php
@@ -177,8 +177,15 @@ protected function prepareRoom(Room $room, string $userId): WidgetItem {
 		$subtitle = '';
 
 		$lastMessage = $room->getLastMessage();
+
+		$lastMentionDirect = $participant->getAttendee()->getLastMentionDirect();
+        $lastReadMessage = $participant->getAttendee()->getLastReadMessage();
+		if ($lastMentionDirect > $lastReadMessage) {
+            $lastMessage = $this->chatManager->getComment($room, (string)$lastMentionDirect);
+		}
+
 		if ($lastMessage instanceof IComment) {
-			$message = $this->messageParser->createMessage($room, $participant, $room->getLastMessage(), $this->l10n);
+			$message = $this->messageParser->createMessage($room, $participant, $lastMessage, $this->l10n);
 			$this->messageParser->parseMessage($message);
 
 			$now = $this->timeFactory->getDateTime();
@@ -202,8 +209,6 @@ protected function prepareRoom(Room $room, string $userId): WidgetItem {
 
 		if ($room->getCallFlag() !== Participant::FLAG_DISCONNECTED) {
 			$subtitle = $this->l10n->t('Call in progress');
-		} elseif ($participant->getAttendee()->getLastMentionDirect() > $participant->getAttendee()->getLastReadMessage()) {
-			$subtitle = $this->chatManager->getComment($room, (string)$participant->getAttendee()->getLastMentionDirect())->getMessage();
 		}
 
 		return new WidgetItem(