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
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2020-06-09 14:46:37 +0300
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2020-06-09 20:09:34 +0300
commitc50be21cda2c1b2a09c19ee42d7cefe417be731d (patch)
tree9d4fa35b7bc87fbdd0c14f42ff4644d83aee4538 /lib
parentd10453b985b8ce0e3fc3b5b540b709465e292783 (diff)
Fix user timeout with numeric ids
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Controller/RoomController.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 956b9f5b9..ae071a028 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -848,17 +848,18 @@ class RoomController extends AEnvironmentAwareController {
$results = [];
foreach ($participants['users'] as $userId => $participant) {
+ $userId = (string) $userId;
if ($participant['sessionId'] !== '0' && $participant['lastPing'] <= $maxPingAge) {
$this->room->leaveRoom($userId);
}
- $user = $this->userManager->get((string) $userId);
+ $user = $this->userManager->get($userId);
if (!$user instanceof IUser) {
continue;
}
$results[] = array_merge($participant, [
- 'userId' => (string) $userId,
+ 'userId' => $userId,
'displayName' => (string) $user->getDisplayName(),
]);
}