plugins-nextcloud-mirror/spreed
1
0
Fork 0
mirror of https://github.com/nextcloud/spreed.git synced 2025-12-18 05:20:50 +01:00
Code Projects Releases Activity

fix(MessageSearch): add threadId attribute for thread messages

Browse source 
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
This commit is contained in:
Maksim Sukharev 2025-09-08 17:12:18 +02:00 • committed by Anna Larch
parent 8745344b9a
commit 04acbd7c76
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Search/MessageSearch.php
View file

@ -19,7 +19,9 @@ use OCA\Talk\Manager as RoomManager;
use OCA\Talk\Model\Attendee;
use OCA\Talk\Room;
use OCA\Talk\Service\ParticipantService;
use OCA\Talk\Service\ThreadService;
use OCA\Talk\Webinary;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Comments\IComment;
use OCP\IL10N;
@ -50,6 +52,7 @@ class MessageSearch implements IProvider, IFilteringProvider {
protected IL10N $l,
protected Config $talkConfig,
protected IUserSession $userSession,
protected ThreadService $threadService,
) {
}
@ -282,6 +285,12 @@ class MessageSearch implements IProvider, IFilteringProvider {
}
}
$threadId = (int)$comment->getTopmostParentId() ?: (int)$comment->getId();
try {
$thread = $this->threadService->findByThreadId($room->getId(), $threadId);
} catch (DoesNotExistException) {
$thread = null;
}
$entry = new SearchResultEntry(
$iconUrl,
str_replace(
@ -290,13 +299,18 @@ class MessageSearch implements IProvider, IFilteringProvider {
$subline
),
$messageStr,
$this->url->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken()]) . '#message_' . $comment->getId(),
$this->url->linkToRouteAbsolute('spreed.Page.showCall', ['token' => $room->getToken()])
. ($thread !== null ? '?threadId=' . $thread->getId() : '')
. '#message_' . $comment->getId(),
'icon-talk', // $iconClass,
true
);
$entry->addAttribute('conversation', $room->getToken());
$entry->addAttribute('messageId', $comment->getId());
if ($thread !== null) {
$entry->addAttribute('threadId', (string)$thread->getId());
}
$entry->addAttribute('actorType', $comment->getActorType());
$entry->addAttribute('actorId', $comment->getActorId());
$entry->addAttribute('timestamp', '' . $comment->getCreationDateTime()->getTimestamp());