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:
Diffstat (limited to 'lib/Controller/RoomController.php')
-rw-r--r--lib/Controller/RoomController.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 57a9ff12b..2fa28da53 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -899,6 +899,7 @@ class RoomController extends AEnvironmentAwareController {
$participants[] = [
'actorType' => Attendee::ACTOR_USERS,
'actorId' => $user->getUID(),
+ 'displayName' => $user->getDisplayName(),
];
}
@@ -954,9 +955,15 @@ class RoomController extends AEnvironmentAwareController {
continue;
}
+ $user = $this->userManager->get($this->userId);
+ if (!$user instanceof IUser) {
+ continue;
+ }
+
$participants[] = [
'actorType' => Attendee::ACTOR_USERS,
'actorId' => $member->getUserId(),
+ 'displayName' => $user->getDisplayName(),
];
}
@@ -1248,6 +1255,7 @@ class RoomController extends AEnvironmentAwareController {
$participantsToAdd[] = [
'actorType' => Attendee::ACTOR_USERS,
'actorId' => $newUser->getUID(),
+ 'displayName' => $newUser->getDisplayName(),
];
} elseif ($source === 'groups') {
$group = $this->groupManager->get($newParticipant);
@@ -1260,6 +1268,7 @@ class RoomController extends AEnvironmentAwareController {
$participantsToAdd[] = [
'actorType' => Attendee::ACTOR_USERS,
'actorId' => $user->getUID(),
+ 'displayName' => $user->getDisplayName(),
];
}
} elseif ($source === 'circles') {
@@ -1286,9 +1295,15 @@ class RoomController extends AEnvironmentAwareController {
continue;
}
+ $user = $this->userManager->get($this->userId);
+ if (!$user instanceof IUser) {
+ continue;
+ }
+
$participantsToAdd[] = [
'actorType' => Attendee::ACTOR_USERS,
'actorId' => $member->getUserId(),
+ 'displayName' => $user->getDisplayName(),
];
}
} elseif ($source === 'emails') {