From 63ad8bbe143305499344295a2756aab087ed43e4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 10 Feb 2021 17:58:40 +0100 Subject: Use the cached display name from attendee for peer list instead of querying the user manager Signed-off-by: Joas Schilling --- lib/Controller/CallController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php index 54e06fafe..19ec07389 100644 --- a/lib/Controller/CallController.php +++ b/lib/Controller/CallController.php @@ -104,9 +104,13 @@ class CallController extends AEnvironmentAwareController { if ($this->getAPIVersion() >= 3) { $displayName = $participant->getAttendee()->getActorId(); if ($participant->getAttendee()->getActorType() === Attendee::ACTOR_USERS) { - $user = $this->userManager->get($participant->getAttendee()->getActorId()); - if ($user instanceof IUser) { - $displayName = $user->getDisplayName(); + if ($participant->getAttendee()->getDisplayName()) { + $displayName = $participant->getAttendee()->getDisplayName(); + } else { + $user = $this->userManager->get($participant->getAttendee()->getActorId()); + if ($user instanceof IUser) { + $displayName = $user->getDisplayName(); + } } } else { $displayName = $guestNames[$participant->getAttendee()->getActorId()] ?? $displayName; -- cgit v1.2.3