Make disp an instance variable, instead of heap, and move parseCommand to Bot

diff --git a/Bot.pm b/Bot.pm
index a4cd6e51c522819f3d73afa3d3a2e6c05fd7be0a..c90f8339d0d061e6009c10c5dd88ac6729ed8860 100644 (file)
--- a/Bot.pm
+++ b/Bot.pm
@@ -35,6 +35,12 @@ use NDIRC::Dispatcher;
 
 use IO::File;
 
+has disp => (
+       is => 'rw',
+       isa => 'Object',
+       lazy_build => 1
+);
+
 # We registered for all events, this will produce some debug info.
 sub _default {
        my ($event, $args) = @_[ARG0 .. $#_];
@@ -81,8 +87,6 @@ sub _start {
        );
        $irc->plugin_add( 'Connector' => $heap->{connector} );
 
-       $kernel->signal($session => 'USR2');
-
        $irc->yield( register => 'all' );
        $irc->yield( connect => { server => 'irc.netgamers.org' } );
 
@@ -109,8 +113,13 @@ sub sig_usr1 {
 }
 
 sub sig_usr2 {
-       my $heap = $_[HEAP];
+       my $self = shift @_;
+
+       $self->disp($self->_build_disp);
+}
 
+sub _build_disp {
+       my ($self) = @_;
        my $disp = new NDIRC::Dispatcher;
 
        if (my $commands = new IO::File 'commands'){
@@ -130,7 +139,7 @@ sub sig_usr2 {
                $disp->add_channel($chan,\@types);
        }
 
-       $heap->{disp} = $disp;
+       return $disp;
 }
 
 sub sig_DIE {
@@ -169,7 +178,7 @@ sub irc_disconnected {
 }
 
 sub irc_001 {
-       my ($sender,$heap,$kernel) = @_[SENDER,HEAP,KERNEL];
+       my ($self,$sender,$kernel) = @_[OBJECT,SENDER,KERNEL];
 
        # Since this is an irc_* event, we can get the component's object by
        # accessing the heap of the sender. Then we register and connect to the
@@ -182,15 +191,15 @@ sub irc_001 {
        $irc->yield( mode => $irc->nick_name, '+ix');
 
        # we join our channels
-       $irc->yield( join => $_ ) for grep /^#/, keys %{$heap->{disp}->channels};
+       $irc->yield( join => $_ ) for grep /^#/, keys %{$self->disp->channels};
        return;
 }
 
 sub irc_invite {
-       my ($sender, $heap, $who, $channel) = @_[SENDER, HEAP, ARG0 .. ARG1];
+       my ($self,$sender, $who, $channel) = @_[OBJECT,SENDER, HEAP, ARG0 .. ARG1];
        my $irc = $sender->get_heap();
 
-       $irc->yield( join => $_ ) for grep /^$channel$/i, keys %{$heap->{disp}->channels}
+       $irc->yield( join => $_ ) for grep /^$channel$/i, keys %{$self->disp->channels}
 }
 
 sub irc_public {
@@ -205,4 +214,49 @@ sub  refresh {
 sub irc_join {
 }
 
+sub parseCommand {
+       my ($self, $msg, $server, $nick, $address, $channel, $model) = @_;
+
+       return if $channel !~ /^#/ && $msg =~ /^~/;
+       $msg = ".$msg"  if $channel !~ /^#/ && $msg =~ /^[^.!]/;
+
+       my ($p,$command,$args) = ($msg =~ /^([.!~])(\S+)(?: (.+))?/);
+
+       if ($msg =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\w+)}){
+               if (!$command || $command =~ m{^http://}){
+                       ($p,$command,$args) = ('.','addscan',$msg);
+               }elsif($command ne 'addscan'){
+                       $self->parseCommand (".addscan $msg", $server, $nick, $address, $channel, $model)
+               }
+       }
+
+       return 0 unless $self->disp->has_command($command,$channel);
+
+       my $reply_string;
+       given ($p){
+               when ('!'){
+                       $reply_string = "privmsg $nick";
+               }
+               when ('~'){
+                       $reply_string = "privmsg $channel";
+               }
+               default {
+                       $reply_string = "notice $nick";
+               }
+       }
+
+       $address =~ s/.*@(.*)/$1/;
+       my $c = NDIRC::Context->new({
+                       host => $address,
+                       nick => $nick,
+                       channel => $channel,
+                       disp => $self->disp,
+                       model => $model,
+                       server => $server,
+                       reply_string => $reply_string,
+               });
+
+       return $self->disp->run_command($c,$command,$args);
+}
+
 1;

diff --git a/Delling.pm b/Delling.pm
index 33141596b3f6d82c29ceebe6ec6e4d1be398dbcd..e08f7910b98c8d4daf90a9c66acd616a2ae1455f 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -26,11 +26,10 @@ use Moose;
 extends 'NDIRC::Bot';
 
 use POE::Session;
-use NDIRC::Misc;
 use ND::DB;
 
 sub irc_public {
-       my ($sender, $heap, $who, $where, $msg) = @_[SENDER, HEAP, ARG0 .. ARG2];
+       my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $channel = $where->[0];
 
@@ -41,7 +40,7 @@ sub irc_public {
        my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?});
        $seen->execute($address);
 
-       if ($msg =~ /^(\S+): (.+)$/ && $heap->{disp}->has_command('anon',$channel)){
+       if ($msg =~ /^(\S+): (.+)$/ && $self->disp->has_command('anon',$channel)){
                my $_ = $1;
                my $text = $2;
                unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){
@@ -49,14 +48,14 @@ sub irc_public {
                }
 
        }
-       if (parseCommand($msg,$irc,$nick,$address,$channel,$heap->{disp},$dbh)){
+       if ($self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh)){
                #Command parsed and run successfully
        }
 }
 
 
 sub irc_msg {
-       my ($sender, $heap, $who, $where, $msg) = @_[SENDER, HEAP, ARG0 .. ARG2];
+       my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $irc = $sender->get_heap();
 
@@ -64,7 +63,7 @@ sub irc_msg {
        my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?});
        $seen->execute($address);
 
-       if (parseCommand($msg,$irc,$nick,$address,'pm',$heap->{disp},$dbh)){
+       if ($self->parseCommand($msg,$irc,$nick,$address,'pm',$dbh)){
                #Command parsed and run successfully
        }else{
                $irc->yield(notice => $nick, "unknown command");
@@ -72,7 +71,7 @@ sub irc_msg {
 }
 
 sub irc_join {
-       my ($sender, $heap, $who, $channel) = @_[SENDER, HEAP, ARG0 .. ARG1];
+       my ($self,$sender, $who, $channel) = @_[OBJECT,SENDER, ARG0 .. ARG1];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $irc = $sender->get_heap();
 
@@ -80,7 +79,7 @@ sub irc_join {
        my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?});
        $seen->execute($address);
 
-       if($heap->{disp}->has_command('voice',$channel)){
+       if($self->disp->has_command('voice',$channel)){
                my $flags = $dbh->prepare_cached(q{
 SELECT DISTINCT flag
 FROM users u

diff --git a/Eos.pm b/Eos.pm
index 258dd729cd6502b16e427f9ae3d529cbf073f95b..75930997bfb18e63ab2f1085430e1c4bf42009ae 100644 (file)
--- a/Eos.pm
+++ b/Eos.pm
@@ -26,20 +26,19 @@ use Moose;
 extends 'NDIRC::Bot';
 
 use POE::Session;
-use NDIRC::Misc;
 use ND::DB;
 
 my ($tick,$stattick) = DB()->selectrow_array(q{SELECT tick(),max(tick) FROM planet_stats});
 my $last_announcement = 0;
 
 sub irc_public {
-       my ($sender, $heap, $who, $where, $msg) = @_[SENDER, HEAP, ARG0 .. ARG2];
+       my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $channel = $where->[0];
 
        my $irc = $sender->get_heap();
 
-       if ($msg =~ /^(\S+): (.+)$/ && $heap->{disp}->has_command('anon',$channel)){
+       if ($msg =~ /^(\S+): (.+)$/ && $self->disp->has_command('anon',$channel)){
                my $_ = $1;
                my $text = $2;
                unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){
@@ -47,31 +46,31 @@ sub irc_public {
                }
 
        }
-       if (parseCommand($msg,$irc,$nick,$address,$channel,$heap->{disp},DB())){
+       if ($self->parseCommand($msg,$irc,$nick,$address,$channel,DB())){
                #Command parsed and run successfully
        }
 }
 
 
 sub irc_msg {
-       my ($sender, $heap, $who, $where, $msg) = @_[SENDER, HEAP, ARG0 .. ARG2];
+       my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $irc = $sender->get_heap();
 
-       if (parseCommand($msg,$irc,$nick,$address,'pm',$heap->{disp},DB())){
+       if ($self->parseCommand($msg,$irc,$nick,$address,'pm',DB())){
                #Command parsed and run successfully
        }else{
-               my $disp = $heap->{disp};
+               my $disp = $self->disp;
                $irc->yield(privmsg => $disp->targets->{def}, chr(3)."04 $nick >> $msg");
-               parseCommand("~report_incs $msg",$irc,$nick,' BATCH ',$disp->targets->{def},$heap->{disp},DB());
+               $self->parseCommand("~report_incs $msg",$irc,$nick,' BATCH ',$disp->targets->{def},DB());
        }
 }
 
 sub irc_join {
-       my ($sender, $heap, $who, $channel) = @_[SENDER, HEAP, ARG0 .. ARG1];
+       my ($self,$sender, $who, $channel) = @_[OBJECT,SENDER, ARG0 .. ARG1];
        my ($nick,$username,$address) = ( split /[!@]/, $who );
        my $irc = $sender->get_heap();
-       my $disp = $heap->{disp};
+       my $disp = $self->disp;
 
        my $dbh = DB();
 
@@ -111,12 +110,12 @@ FROM users u WHERE hostmask = ?
 }
 
 sub refresh {
-       my ($kernel,$heap) = @_[KERNEL,HEAP];
+       my ($self,$kernel,$heap) = @_[OBJECT,KERNEL,HEAP];
        $kernel->delay( refresh => 60 );
        print 'Time: ' . time() . ' Lag: ' . $heap->{connector}->lag() . "\n";
 
        my $irc = $heap->{irc};
-       my $disp = $heap->{disp};
+       my $disp = $self->disp;
        my $dbh = DB();
 
        my @row = $dbh->selectrow_array(q{SELECT tick(), max(tick) FROM planet_stats});
@@ -134,7 +133,7 @@ sub refresh {
        while (my $req = $ircreqs->fetchrow_hashref){
                if ($req->{channel} eq 'def'){
                        $irc->yield(privmsg => $disp->targets->{def}, chr(3)."04 ## $req->{username} via webbie ## >> $req->{message}");
-                       parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ',$disp->targets->{def},$heap->{disp},$dbh);
+                       $self->parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ',$disp->targets->{def},$dbh);
                }elsif(exists $disp->targets->{$req->{channel}}){
                        $irc->yield(privmsg => $disp->targets->{$req->{channel}}, "<$req->{username} via webbie> $req->{message}");
                }

diff --git a/Misc.pm b/Misc.pm
index bada45151b3df42dc46c3c60f289a7937021727d..aad40e3c36aa5f9fcfb1c5a448a87ce55d61145f 100644 (file)
--- a/Misc.pm
+++ b/Misc.pm
@@ -27,7 +27,7 @@ use NDIRC::Context;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/valuecolor parseCommand/;
+our @EXPORT = qw/valuecolor/;
 
 sub valuecolor {
        my $s = $_;
@@ -40,49 +40,5 @@ sub valuecolor {
        return $s;
 }
 
-sub parseCommand {
-       my ($msg, $server, $nick, $address, $channel, $disp,$model) = @_;
-
-       return if $channel !~ /^#/ && $msg =~ /^~/;
-       $msg = ".$msg"  if $channel !~ /^#/ && $msg =~ /^[^.!]/;
-
-       my ($p,$command,$args) = ($msg =~ /^([.!~])(\S+)(?: (.+))?/);
-
-       if ($msg =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\w+)}){
-               if (!$command || $command =~ m{^http://}){
-                       ($p,$command,$args) = ('.','addscan',$msg);
-               }elsif($command ne 'addscan'){
-                       parseCommand (".addscan $msg", $server, $nick, $address, $channel, $disp,$model)
-               }
-       }
-
-       return 0 unless $disp->has_command($command,$channel);
-
-       my $reply_string;
-       given ($p){
-               when ('!'){
-                       $reply_string = "privmsg $nick";
-               }
-               when ('~'){
-                       $reply_string = "privmsg $channel";
-               }
-               default {
-                       $reply_string = "notice $nick";
-               }
-       }
-
-       $address =~ s/.*@(.*)/$1/;
-       my $c = NDIRC::Context->new({
-                       host => $address,
-                       nick => $nick,
-                       channel => $channel,
-                       disp => $disp,
-                       model => $model,
-                       server => $server,
-                       reply_string => $reply_string,
-               });
-
-       return $disp->run_command($c,$command,$args);
-}
 
 1;