Skip to content

Only calculate the room name once instead of loading all participants #6945

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 1 commit into from
Mar 1, 2022
Merged

Only calculate the room name once instead of loading all participants #6945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion lib/Activity/Listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,11 @@ public function generateInvitationActivity(Room $room, array $participants): voi
return;
}

// We know the new participant is in the room,
// so skip loading them just to make sure they can read it.
// Must be overwritten later on for one-to-one chats.
$roomName = $room->getDisplayName($actorId);

foreach ($participants as $participant) {
if ($participant['actorType'] !== Attendee::ACTOR_USERS) {
// No user => no activity
Expand All @@ -244,7 +249,10 @@ public function generateInvitationActivity(Room $room, array $participants): voi
}

try {
$roomName = $room->getDisplayName($participant['actorId']);
if ($room->getType() === Room::TYPE_ONE_TO_ONE) {
// Overwrite the room name with the other participant
$roomName = $room->getDisplayName($participant['actorId']);
}
$event
->setObject('room', $room->getId(), $roomName)
->setSubject('invitation', [
Expand Down