Basic conversion to POE::Component::IRC

[NDIRC.git] / Commands / Channel.pm

diff --git a/Commands/Channel.pm b/Commands/Channel.pm
index ad627b3d835e37f9891c670405375faf70755db5..9207b0c4cadf71645339da18cab0eaec2756c1bc 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 u.hostmask ILIKE $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->host,$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");
        }
@@ -76,12 +76,11 @@ sub invite
                my @access = ('auto_invite');
                push @access, 'invite' 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)
+SELECT DISTINCT channel FROM users u
+       JOIN groupmembers g USING (uid)
+       JOIN channel_group_flags gf USING (gid)
+       JOIN channel_flags f USING (flag)
+WHERE u.hostmask ILIKE $1 AND COALESCE(channel = $2,TRUE)
        AND (f.name = ANY($3) )
                });
                $channels->execute($c->host,$channel,\@access);
@@ -90,7 +89,7 @@ WHERE u.hostmask ILIKE $1 AND COALESCE(c.name = $2,TRUE)
                }
        }
        for (@channels){
-               $c->server->command("invite ". $c->nick ." $_");
+               $c->command(invite => $c->nick, $_);
        }
 }