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>2019-07-08 17:08:02 +0300
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2019-08-28 11:28:05 +0300
commit7f0dd779512e572d2040c86800fb8a3ea5cf3e64 (patch)
treefaac53e3e47756944f16761a0d438cb600fbbcf9 /lib/Controller
parentea48d5ade2c53638a9290a251e8c40e2be552b2d (diff)
Allow users to load the room data when joining it
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/Controller')
-rw-r--r--lib/Controller/RoomController.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 653a9353f..30aa3aaac 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -895,10 +895,9 @@ class RoomController extends AEnvironmentAwareController {
$this->session->removePasswordForRoom($token);
$this->session->setSessionForRoom($token, $newSessionId);
$room->ping($this->userId, $newSessionId, $this->timeFactory->getTime());
+ $currentParticipant = $room->getParticipantBySession($newSessionId);
- return new DataResponse([
- 'sessionId' => $newSessionId,
- ]);
+ return new DataResponse($this->formatRoom($room, $currentParticipant));
}
/**