Skip to content

fix(threads): Add the thread title to the system message #15604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Jul 30, 2025
Merged

fix(threads): Add the thread title to the system message #15604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd549a6
fix(threads): Add the thread title to the system message
nickvergessen Jul 30, 2025
2623698
fix(threads): Add missing parent on attachment threads
nickvergessen Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/Chat/Parser/SystemMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,12 @@ protected function parseMessage(Message $chatMessage, $allowInaccurate): void {
$parsedMessage = $this->l->t('You set up Matterbridge to synchronize this conversation with other chats');
}
} elseif ($message === 'thread_created') {
$parsedMessage = $this->l->t('{actor} created a thread');
$parsedMessage = $this->l->t('{actor} created thread {title}');
$parsedParameters['title'] = [
'type' => 'highlight',
'id' => 'thread/' . $parameters['thread'],
'name' => $parameters['title'] ?? (string)$parameters['thread'],
];
} elseif ($message === 'matterbridge_config_edited') {
$parsedMessage = $this->l->t('{actor} updated the Matterbridge configuration');
if ($currentUserIsActor) {
Expand Down
33 changes: 27 additions & 6 deletions lib/Chat/SystemMessage/Listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,12 @@ protected function fixMimeTypeOfVoiceMessage(ShareCreatedEvent|BeforeDuplicateSh
$silent = false;
}

$replyTo = null;
if (isset($metaData['replyTo'])) {
$replyTo = (int)$metaData['replyTo'];
unset($metaData['replyTo']);
}

$threadTitle = '';
if (isset($metaData['threadTitle'])) {
if (is_string($metaData['threadTitle']) && trim($metaData['threadTitle']) !== '') {
Expand All @@ -404,17 +410,24 @@ protected function fixMimeTypeOfVoiceMessage(ShareCreatedEvent|BeforeDuplicateSh
unset($metaData['threadTitle']);
}

$comment = $this->sendSystemMessage($room, 'file_shared', ['share' => $share->getId(), 'metaData' => $metaData], silent: $silent);
$comment = $this->sendSystemMessage(
$room,
'file_shared',
['share' => $share->getId(), 'metaData' => $metaData],
silent: $silent,
replyTo: $replyTo,
);

if ($threadTitle !== '' && $comment->getTopmostParentId() === '0') {
$this->threadService->createThread($room, (int)$comment->getId(), $threadTitle);

$this->sendSystemMessage(
$room,
'thread_created',
['thread' => (int)$comment->getId()],
['thread' => (int)$comment->getId(), 'title' => $threadTitle],
shouldSkipLastMessageUpdate: true,
silent: true,
parent: $comment,
);
}
}
Expand Down Expand Up @@ -451,7 +464,17 @@ protected function attendeesRemovedEvent(AttendeesRemovedEvent $event): void {
}
}

protected function sendSystemMessage(Room $room, string $message, array $parameters = [], ?Participant $participant = null, bool $shouldSkipLastMessageUpdate = false, bool $silent = false, bool $forceSystemAsActor = false): IComment {
protected function sendSystemMessage(
Room $room,
string $message,
array $parameters = [],
?Participant $participant = null,
bool $shouldSkipLastMessageUpdate = false,
bool $silent = false,
bool $forceSystemAsActor = false,
?int $replyTo = null,
?IComment $parent = null,
): IComment {
if ($participant instanceof Participant) {
$actorType = $participant->getAttendee()->getActorType();
$actorId = $participant->getAttendee()->getActorId();
Expand Down Expand Up @@ -486,9 +509,7 @@ protected function sendSystemMessage(Room $room, string $message, array $paramet
$referenceId = (string)$referenceId;
}

$parent = null;
$replyTo = $parameters['metaData']['replyTo'] ?? null;
if ($replyTo !== null) {
if ($parent === null && $replyTo !== null) {
try {
$parentComment = $this->chatManager->getParentComment($room, (string)$replyTo);
$parentMessage = $this->messageParser->createMessage($room, $participant, $parentComment, $this->l);
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/ChatController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ public function sendMessage(string $message, string $actorDisplayName = '', stri
$this->room,
$this->participant->getAttendee()->getActorType(),
$this->participant->getAttendee()->getActorId(),
json_encode(['message' => 'thread_created', 'parameters' => ['thread' => (int)$comment->getId()]]),
json_encode(['message' => 'thread_created', 'parameters' => ['thread' => (int)$comment->getId(), 'title' => $threadTitle]]),
$this->timeFactory->getDateTime(),
false,
null,
Expand Down
4 changes: 4 additions & 0 deletions tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2916,6 +2916,10 @@ public function userSeesTheFollowingSystemMessagesInRoom(string $user, string $i
if ($result) {
$message['messageParameters'] = str_replace($matches[0], '"' . self::$questionToPollId[$matches[1]] . '"', $message['messageParameters']);
}
$result = preg_match('/THREAD_ID\(([^)]+)\)/', $message['messageParameters'], $matches);
if ($result) {
$message['messageParameters'] = str_replace($matches[0], '"thread\/' . self::$titleToThreadId[$matches[1]] . '"', $message['messageParameters']);
}
$message['messageParameters'] = str_replace('{$REMOTE_URL}', trim(json_encode(trim($this->remoteServerUrl, '/')), '"'), $message['messageParameters']);
}
return $message;
Expand Down
9 changes: 9 additions & 0 deletions tests/integration/features/chat-4/threads.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ Feature: chat-4/threads
Then user "participant1" sees the following recent threads in room "room" with 200
| t.id | t.title | t.numReplies | t.lastMessage | a.notificationLevel | firstMessage | lastMessage |
| Message 1 | Thread 1 | 1 | Message 1-1 | 0 | Message 1 | Message 1-1 |
Then user "participant1" sees the following messages in room "room" with 200
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
| room | users | participant2 | participant2-displayname | Message 1-1 | [] | Message 1 |
| room | users | participant1 | participant1-displayname | Message 1 | [] | |
Then user "participant1" sees the following system messages in room "room" with 200
| room | actorType | actorId | systemMessage | message | silent | messageParameters |
| room | users | participant1 | thread_created | {actor} created thread {title} | true | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","mention-id":"participant1"},"title":{"type":"highlight","id":THREAD_ID(Thread 1),"name":"Thread 1"}} |
| room | users | participant1 | user_added | You added {user} | !ISSET | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","mention-id":"participant1"},"user":{"type":"user","id":"participant2","name":"participant2-displayname","mention-id":"participant2"}} |
| room | users | participant1 | conversation_created | You created the conversation | !ISSET | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","mention-id":"participant1"}} |

Scenario: Recent threads are sorted by last activity
Given user "participant1" creates room "room" (v4)
Expand Down
Loading