Introduce a uid member for the context and use it intead of the host in commands

[NDIRC.git] / Commands / Channel.pm

diff --git a/Commands/Channel.pm b/Commands/Channel.pm
index ad627b3d835e37f9891c670405375faf70755db5..f83969ea8f4594f69b3f790e015412c608672329 100644 (file)
--- a/Commands/Channel.pm
+++ b/Commands/Channel.pm
@@ -33,29 +33,29 @@ sub op
 {
        my ($self,$c,$msg) = @_;
 
-       my ($access) = $self->name =~ /(op|voice)/;
+       $self->name =~ /(de)?(op|voice)/;
+       my @access = ($2);
+       my $mod = $1 ? '-' : '';
 
-       my $where = "";
        if ($msg =~ /^\s*$/){
                $msg = $c->nick;
-               $where = "OR f.name = 'auto_$access'";
+               push @access, "auto_$access[0]";
        }
 
-       my $mode = qq{
-SELECT DISTINCT c.name FROM users u
-       JOIN groupmembers g ON g.uid = u.uid
-       JOIN channel_group_flags gf ON g.gid = gf.group
-       JOIN channels c ON gf.channel = c.id
-       JOIN channel_flags f ON f.id = gf.flag
-WHERE u.hostmask ILIKE ? AND c.name = ? AND (f.name = '$access' $where);
+       my $mode = q{
+SELECT DISTINCT LOWER(flag) FROM users u
+       JOIN groupmembers g USING (uid)
+       JOIN channel_group_flags gf USING (gid)
+       JOIN channel_flags f USING (flag)
+WHERE uid = $1 AND channel = $2 AND f.name = ANY($3);
                };
        if ($c->check_user_roles(qw/irc_masterop/)){
-               $mode = 1;
+               $mode = substr $access[0], 0,1;
        }else{
-               ($mode) = $c->model->selectrow_array($mode,undef,$c->host,$c->channel);
+               ($mode) = $c->model->selectrow_array($mode,undef,$c->uid,$c->channel,\@access);
        }
        if ($mode){
-               $c->server->command($self->name . " " . $c->channel . " $msg");
+               $c->command(mode => $c->channel, "$mod$mode", $msg);
        }else{
                $c->reply("No access to " . $self->name . " in this channel");
        }
@@ -73,24 +73,22 @@ sub invite
        if ($channel && $c->check_user_roles('irc_masterinvite')){
                push @channels,$channel;
        }else{
-               my @access = ('auto_invite');
-               push @access, 'invite' if $channel;
+               my @access = ('i');
+               push @access, 'I' if $channel;
                my $channels = $c->model->prepare(q{
-SELECT DISTINCT c.name FROM users u
-       JOIN groupmembers g ON g.uid = u.uid
-       JOIN channel_group_flags gf ON g.gid = gf.group
-       JOIN channels c ON gf.channel = c.id
-       JOIN channel_flags f ON f.id = gf.flag
-WHERE u.hostmask ILIKE $1 AND COALESCE(c.name = $2,TRUE)
-       AND (f.name = ANY($3) )
+SELECT DISTINCT channel FROM users u
+       JOIN groupmembers g USING (uid)
+       JOIN channel_group_flags gf USING (gid)
+WHERE uid = $1 AND COALESCE(channel = $2,TRUE)
+       AND (flag = ANY($3) )
                });
-               $channels->execute($c->host,$channel,\@access);
+               $channels->execute($c->uid,$channel,\@access);
                while (my ($channel) = $channels->fetchrow()){
                        push @channels,$channel;
                }
        }
        for (@channels){
-               $c->server->command("invite ". $c->nick ." $_");
+               $c->command(invite => $c->nick, $_);
        }
 }
 
@@ -132,8 +130,8 @@ sub getpass
        my $password = generate_random_string 10;
        my $update = $dbh->do(q{
 UPDATE users SET password = MD5( ? )
-WHERE hostmask ILIKE ? AND password =''
-               },undef,$password,$c->host);
+WHERE uid  ? AND password =''
+               },undef,$password,$c->uid);
        if ($update > 0){
                $c->reply("Password set to: $password (you can change it on webbie)");
        }else{