Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2021-02-10 19:58:40 +0300
committerJoas Schilling <coding@schilljs.com>2021-02-11 20:56:36 +0300
commit63ad8bbe143305499344295a2756aab087ed43e4 (patch)
tree1c0a14dd95efd453b55567c7b6aea3201caafa5d
parentf68e64e5dcc81dc87b1efe1ff30f558d3a4dae0d (diff)
Use the cached display name from attendee for peer list instead of querying the user manager
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/Controller/CallController.php10
1 files 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;