dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Fix JSON bool comparison" 

This reverts commit f08a17495c.
This commit is contained in:
Daniel Berteaud 2016-09-01 09:33:49 +02:00
parent c39bdc8fd2
commit 4bda07f8d8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vroom
View File

@ -1356,9 +1356,9 @@ websocket '/socket.io/:ver/websocket/:id' => sub {
next if $peer eq $id; next if $peer eq $id;
next if !$peers->{$peer}->{room}; next if !$peers->{$peer}->{room};
next if $peers->{$peer}->{room} ne $room; next if $peers->{$peer}->{room} ne $room;
$others->{$peer}->{screen} = ($peers->{$peer}->{details}->{screen} eq "\1") ? \1 : \0; $others->{$peer}->{screen} = ($peers->{$peer}->{details}->{screen} eq Mojo::JSON::true) ? \1 : \0;
$others->{$peer}->{video} = ($peers->{$peer}->{details}->{video} eq "\1") ? \1 : \0; $others->{$peer}->{video} = ($peers->{$peer}->{details}->{video} eq Mojo::JSON::true) ? \1 : \0;
$others->{$peer}->{audio} = ($peers->{$peer}->{details}->{audio} eq "\1") ? \1 : \0; $others->{$peer}->{audio} = ($peers->{$peer}->{details}->{audio} eq Mojo::JSON::true) ? \1 : \0;
} }
$peer->{details} = { $peer->{details} = {
screen => \0, screen => \0,
@ -1966,10 +1966,10 @@ any '/api' => sub {
# Room persistence can only be set by admins # Room persistence can only be set by admins
if ($req->{param}->{persistent} ne '' && if ($req->{param}->{persistent} ne '' &&
$self->key_can_do_this({token => $token, action => 'set_persistent'})){ $self->key_can_do_this({token => $token, action => 'set_persistent'})){
$room->{persistent} = ($req->{param}->{persistent} eq "\1") ? '1' : '0'; $room->{persistent} = ($req->{param}->{persistent} eq Mojo::JSON::true) ? '1' : '0';
} }
foreach my $pass (qw/join_password owner_password/){ foreach my $pass (qw/join_password owner_password/){
if ($req->{param}->{$pass} eq "\0"){ if ($req->{param}->{$pass} eq Mojo::JSON::false){
$room->{$pass} = undef; $room->{$pass} = undef;
} }
elsif ($req->{param}->{$pass} ne ''){ elsif ($req->{param}->{$pass} ne ''){