Skip to content

⏳ Lobby #1926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 27 commits into from
Aug 28, 2019
Merged

⏳ Lobby #1926

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
12952b9
Add a lobby state column to the room table
nickvergessen Jun 27, 2019
a48650c
Read and allow to set the lobby state
nickvergessen Jun 27, 2019
8524f18
Send notification to signaling backend when lobby state changes
danxuliu Aug 26, 2019
d8563f8
Add an API endpoint to set the lobby state
nickvergessen Jun 27, 2019
3b205bf
Add support for promoting and demoting guests in the integration tests
danxuliu Aug 26, 2019
d59725e
Add integration tests for setting the lobby state
danxuliu Aug 26, 2019
6b6f42d
Prevent access to some APIs for non-moderators if lobby is enabled
nickvergessen Jun 27, 2019
ea48d5a
Add integration tests for preventing access to some APIs in the lobby
danxuliu Aug 26, 2019
7f0dd77
Allow users to load the room data when joining it
nickvergessen Jul 8, 2019
36e3da0
No participants and chat messages for users in the lobby
nickvergessen Jul 4, 2019
8cd5064
Allow a timer as well
nickvergessen Jul 4, 2019
ac1c152
Add capability
nickvergessen Jul 5, 2019
3eec1b0
Use a different status code for lobby blocked requests
nickvergessen Jul 8, 2019
d4b7300
Remove outdated comment
nickvergessen Jul 8, 2019
42f8b06
Add system messages for the lobby state change
nickvergessen Jul 9, 2019
18336c0
Transform time to UTC before storing in the database
nickvergessen Jul 23, 2019
f56ab8f
Prevent nested calls between setLobby and getLobbyState when the time…
nickvergessen Jul 23, 2019
1136b70
Fix the system message when the timer was reached
nickvergessen Jul 24, 2019
369c3e4
Make the API work with timestamps
nickvergessen Jul 29, 2019
0e4fcbb
Bump version to trigger the migration
danxuliu Aug 26, 2019
8745fd1
Rename lobby constants
danxuliu Aug 28, 2019
787440f
Extract methods to set the main view
danxuliu Mar 4, 2019
3a5549c
Add UI to set the lobby state
danxuliu Aug 26, 2019
0ab60ec
Show empty content view when current participant is in the lobby
danxuliu Aug 27, 2019
bd56d8c
Show the start time in the lobby message of the empty content view
danxuliu Aug 27, 2019
c61047a
Add input to set the lobby timer
danxuliu Aug 27, 2019
22be1a9
Add acceptance tests for joining a room with a lobby
danxuliu Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Transform time to UTC before storing in the database 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @danxuliu
nickvergessen authored and danxuliu committed Aug 28, 2019
commit 18336c0b10712d76a732a10a5c0397b49e9fd4ba
7 changes: 6 additions & 1 deletion lib/Controller/WebinaryController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ public function __construct(string $appName,
public function setLobby(int $state, ?string $timer = null): DataResponse {
$timerDateTime = null;
if (trim((string) $timer) !== '') {
$timerDateTime = $this->timeFactory->getDateTime($timer);
try {
$timerDateTime = $this->timeFactory->getDateTime($timer);
$timerDateTime->setTimezone(new \DateTimeZone('UTC'));
} catch (\Exception $e) {
return new DataResponse([], Http::STATUS_BAD_REQUEST);
}
}

if (!$this->room->setLobby($state, $timerDateTime)) {
Expand Down