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

Some more simplification in peer role handling

This commit is contained in:
Daniel Berteaud 2015-06-26 16:26:02 +02:00
parent 54f0648d1d
commit 92de57efdb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vroom.pl
View File

@ -348,8 +348,8 @@ helper set_peer_role => sub {
# Return the role of a peer, take a peer object as arg ($data = { peer_id => XYZ })
helper get_peer_role => sub {
my $self = shift;
my ($data) = @_;
return $peers->{$data->{peer_id}}->{role};
my ($peer_id) = @_;
return $peers->{$peer_id}->{role};
};
# Promote a peer to owner
@ -1840,14 +1840,14 @@ any '/api' => sub {
);
}
if ($self->session('peer_id') && $self->session('peer_id') eq $peer_id){
my $api_role = $self->get_key_role($token,$room->{name});
# If we just have been promoted to owner
if ($self->session($room->{name})->{role} ne 'owner' &&
$self->get_peer_role({room => $room->{name}, peer_id => $peer_id}) &&
$self->get_peer_role({room => $room->{name}, peer_id => $peer_id}) eq 'owner'){
$self->session($room->{name})->{role} = 'owner';
if ($api_role ne 'owner' &&
$self->get_peer_role($peer_id) &&
$self->get_peer_role($peer_id) eq 'owner'){
$self->associate_key_to_room(
room => $room->{name},
key => $self->session('key'),
key => $token,
role => 'owner'
);
if (!$res){
@ -1861,7 +1861,7 @@ any '/api' => sub {
}
}
}
my $role = $self->get_peer_role({room => $room->{name}, peer_id => $peer_id});
my $role = $self->get_peer_role($peer_id);
if (!$role){
return $self->render(
json => {