From 8a4ea372a6296ecbd4f271c036aa5f2015e64c2a Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Mon, 30 Nov 2009 00:18:45 +0100 Subject: [PATCH] Converted Channel to new infrastructure --- Commands/Channel.pm | 194 ++++++++++++++++++++++++-------------------- 1 file changed, 105 insertions(+), 89 deletions(-) diff --git a/Commands/Channel.pm b/Commands/Channel.pm index 3907a89..21d34ed 100644 --- a/Commands/Channel.pm +++ b/Commands/Channel.pm @@ -1,5 +1,5 @@ #************************************************************************** -# Copyright (C) 2008 by Michael Andreen * +# Copyright (C) 2009 by Michael Andreen * # * # This program is free software; you can redistribute it and/or modify * # it under the terms of the GNU General Public License as published by * @@ -17,126 +17,142 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * #**************************************************************************/ -package NDIRC::Commands::Channel; - use strict; use warnings; use feature ':5.10'; -use Moose; -use MooseX::MethodAttributes; - -sub op - : Alias(qw/deop voice devoice/) - : Help(syntax: .op [nicks] | Gives op to the specified nicks, or yourself if no command is given) - : Type(channel) -{ - my ($self,$c,$msg) = @_; +use MooseX::Declare; +use NDIRC::Dispatcher; - $self->name =~ /(de)?(op|voice)/; - my @access = ($2); - my $mod = $1 ? '-' : ''; +my $access = class extends NDIRC::Command { + method execute ($c,$msg) { + $self->name =~ /(de)?(op|voice)/; + my @access = ($2); + my $mod = $1 ? '-' : ''; - if ($msg =~ /^\s*$/){ - $msg = $c->nick; - push @access, "auto_$access[0]"; - } + if ($msg =~ /^\s*$/){ + $msg = $c->nick; + push @access, "auto_$access[0]"; + } - my $mode = q{ + 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 = substr $access[0], 0,1; - }else{ - ($mode) = $c->model->selectrow_array($mode,undef,$c->uid,$c->channel,\@access); - } - if ($mode){ - $c->command(mode => $c->channel, "$mod$mode", $msg); - }else{ - $c->reply("No access to " . $self->name . " in this channel"); + if ($c->check_user_roles(qw/irc_masterop/)){ + $mode = substr $access[0], 0,1; + }else{ + ($mode) = $c->model->selectrow_array($mode,undef,$c->uid,$c->channel,\@access); + } + if ($mode){ + $c->command(mode => $c->channel, "$mod$mode", $msg); + }else{ + $c->reply("No access to " . $self->name . " in this channel"); + } } -} - -sub invite - :Help(Syntax: invite [channel] | If no channel is specified it invites you to all channel you have auto invite access on) - : Type(pm) -{ - my ($self,$c,$msg) = @_; - - my ($channel) = $msg =~ /^\s*(\S+)?\s*$/ or die 'ARGS'; - - my @channels; - if ($channel && $c->check_user_roles('irc_masterinvite')){ - push @channels,$channel; - }else{ - my @access = ('i'); - push @access, 'I' if $channel; - my $channels = $c->model->prepare(q{ +}; + +command op => { + help => q(syntax: .op [nicks] | Gives op to the specified nicks, or yourself if no command is given), + type => q(channel), +}, $access; + +command deop => { + help => q(syntax: .deop [nicks] | Removes op from the specified nicks, or yourself if no command is given), + type => q(channel), +}, $access; + +command voice => { + help => q(syntax: .voice [nicks] | Gives voice to the specified nicks, or yourself if no command is given), + type => q(channel), +}, $access; + +command devoice => { + help => q(syntax: .voice [nicks] | Removes voice from the specified nicks, or yourself if no command is given), + type => q(channel), +}, $access; + +command invite => { + help => q(Syntax: invite [channel] | If no channel is specified it invites you to all channel you have auto invite access on), + type => q(pm) +}, class extends NDIRC::Command { + method execute ($c,$msg) { + my ($channel) = $msg =~ /^\s*(\S+)?\s*$/ or die 'ARGS'; + + my @channels; + if ($channel && $c->check_user_roles('irc_masterinvite')){ + push @channels,$channel; + }else{ + my @access = ('i'); + push @access, 'I' if $channel; + my $channels = $c->model->prepare(q{ 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->uid,$channel,\@access); - while (my ($channel) = $channels->fetchrow()){ - push @channels,$channel; + }); + $channels->execute($c->uid,$channel,\@access); + while (my ($channel) = $channels->fetchrow()){ + push @channels,$channel; + } + } + for (@channels){ + $c->command(invite => $c->nick, $_); } } - for (@channels){ - $c->command(invite => $c->nick, $_); - } -} +}; -sub hostname - : Help(Shows your hostname, as seen by the bots.) -{ - my ($self,$c,$msg) = @_; +command hostname => { + help => q(Shows your hostname, as seen by the bots.) +}, class extends NDIRC::Command { + method execute ($c,$msg) { + $c->reply('Your hostname is: '.$c->host); + } +}; - $c->reply('Your hostname is: '.$c->host); -} +command getpass => { + help => q(Gives new users a random password.), + type => q(pm) +}, class extends NDIRC::Command { ########################################################### # Written by Guy Malachi http://guymal.com # 18 August, 2002 ########################################################### -sub generate_random_string -{ - my $length_of_randomstring=shift;# the length of - # the random string to generate - - my @chars=('a'..'z','A'..'Z','0'..'9','_'); - my $random_string; - foreach (1..$length_of_randomstring) + sub generate_random_string { - # rand @chars will generate a random - # number between 0 and scalar @chars - $random_string .= $chars[rand @chars]; + my $length_of_randomstring=shift;# the length of + # the random string to generate + + my @chars=('a'..'z','A'..'Z','0'..'9','_'); + my $random_string; + foreach (1..$length_of_randomstring) + { + # rand @chars will generate a random + # number between 0 and scalar @chars + $random_string .= $chars[rand @chars]; + } + return $random_string; } - return $random_string; -} - -sub getpass - : Help(Gives new users a random password.) - : Type(pm) -{ - my ($self,$c,$msg) = @_; - my $dbh = $c->model; - - my $password = generate_random_string 10; - my $update = $dbh->do(q{ + + method execute ($c,$msg) { + my $dbh = $c->model; + + my $password = generate_random_string 10; + my $update = $dbh->do(q{ UPDATE users SET password = MD5( ? ) WHERE uid = ? AND password ='' - },undef,$password,$c->uid); - if ($update > 0){ - $c->reply("Password set to: $password (you can change it on webbie)"); - }else{ - $c->reply("Couldn't set password. Either it has already been set or you don't have an account"); + },undef,$password,$c->uid); + if ($update > 0){ + $c->reply("Password set to: $password (you can change it on webbie)"); + }else{ + $c->reply("Couldn't set password. Either it has already been set or you don't have an account"); + } } -} +}; 1; -- 2.39.2