Fix for Talk-Widget direct mentions #11929
Conversation
- Get last unread mention message using last unread mention id - Only direct mentions are displayed in Talk-Widget
lib/Service/ParticipantService.php
Outdated
| ->where('c.id = :mentionId') | ||
| ->setParameter('mentionId', $mentionId) |
There was a problem hiding this comment.
While this works in the doctrine query builder, we never use this pattern. You will always find code like the following when looking around:
| ->where('c.id = :mentionId') | |
| ->setParameter('mentionId', $mentionId) | |
| ->where($query->expr()->eq('c.id', $query->createNamedParameter($mentionId))) |
There was a problem hiding this comment.
These statements are removed with the removal of the function getLastUnreadMentionMessage() in ParticipantService.php. Also noticed the common way of building queries in this project.
lib/Dashboard/TalkWidget.php
Outdated
| } elseif ($participant->getAttendee()->getLastMentionMessage() > $participant->getAttendee()->getLastReadMessage()) { | ||
| $subtitle = $this->l10n->t('You were mentioned'); | ||
| } elseif ($participant->getAttendee()->getLastMentionDirect() > $participant->getAttendee()->getLastReadMessage()) { | ||
| $subtitle = $this->chatManager->getComment($room, (string)$participant->getAttendee()->getLastMentionDirect())->getMessage(); |
There was a problem hiding this comment.
The message could be expired or deleted, there is no check for it's existence before using getMessage()
Also the message is not "parsed" so it would show Hi @userid instead of Hi Display Name. See the above block if ($lastMessage instanceof IComment) { for how to do that (and basically the code from here could be moved up and combined, so we don't parse $lastMessage when we don't use it anyway and instead parse the lastMention comment (when it exists)
There was a problem hiding this comment.
Added the checks for expired/deleted messages. And, also added the parse function to display the correct mention name instead of @mentionid.
I think similar checks/changes will be required in RoomFormatter.php for lastUnreadDirectMention, I will look at it tomorrow.
There was a problem hiding this comment.
Similar checks and parsing have also been implemented for RoomFormatter to check deleted or expired messages. Also, the actual name of the users are displayed instead of @userid.
Also added parsing of mention message correctly
user, instead of @userid
|
There are still too many unneeded/undesired changes here while the actual code could still be improved, so I'm closing this for now. |
☑️ Resolves