- updated apt's source to cvs, undefined values here and there popped

[infobot.git] / src / IRC / IrcHooks.pl

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 4a424dc58ab6659511919f86a078df58f34e5995..92238fb9a0725787c3fe1ae6347720327600ef83 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -133,6 +133,17 @@ sub on_chat {
     return 'DCC CHAT MESSAGE';
 }
 
+# is there isoff? how do we know if someone signs off?
+sub on_ison {
+    my ($self, $event) = @_;
+    my $x1 = ($event->args)[0];
+    my $x2 = ($event->args)[1];
+
+#    &nick( $param{'ircNick'} );
+
+    &DEBUG("on_ison: x1 = '$x1', x2 => '$x2'");
+}
+
 sub on_endofmotd {
     my ($self) = @_;
 
@@ -185,17 +196,21 @@ sub on_endofmotd {
 
     &status("End of motd. Now lets join some channels...");
     if (!scalar @joinchan) {
-       &WARN("joinchan array is empty!!!");
+       &WARN("joinchan array is empty!");
        @joinchan = &getJoinChans(1);
     }
 
     # ok, we're free to do whatever we want now. go for it!
     $running = 1;
 
-    # unfortunately, Net::IRC does not implement this :(
-    # invalid command... what is it?
-#    &rawout("NOTIFY $ident");
-#    &DEBUG("adding self to NOTIFY list.");
+    # add ourself to notify.
+    $conn->ison( $param{'ircNick'} );
+
+    # Q, as on quakenet.org.
+    if (&IsParam("Q_pass")) {
+       &status("Authing to Q...");
+       &rawout("PRIVMSG Q\@CServe.quakenet.org :AUTH $param{'Q_user'} $param{'Q_pass'}");
+    }
 
     &joinNextChan();
 }
@@ -228,13 +243,8 @@ sub on_dcc {
        my $get = ($event->args)[2];
        open(DCCGET,">$get");
 
-       $self->new_get($nick,
-               ($event->args)[2],
-               ($event->args)[3],
-               ($event->args)[4],
-               ($event->args)[5],
-               \*DCCGET
-       );
+       $self->new_get($event, \*DCCGET);
+
     } elsif ($type eq 'GET') { # SEND for us?
        &status("DCC: Initializing SEND for $nick.");
        $self->new_send($event->args);
@@ -242,6 +252,7 @@ sub on_dcc {
     } elsif ($type eq 'CHAT') {
        &status("DCC: Initializing CHAT for $nick.");
        $self->new_chat($event);
+#      $self->new_chat(1, $nick, $event->host);
 
     } else {
        &WARN("${b_green}DCC $type$ob (1)");
@@ -366,17 +377,19 @@ sub on_disconnect {
     &DEBUG("on_disconnect: 1");
     &clearIRCVars();
     &DEBUG("on_disconnect: 2");
-    if (defined $self and !$self->connect()) {
+
+    if (!defined $self) {
+       &WARN("on_disconnect: self is undefined! WTF");
+       &DEBUG("running function irc... lets hope this works.");
+       &irc();
+       return;
+    }
+
+    if (!$self->connect()) {
        &DEBUG("on_disconnect: 3");
        &WARN("not connected? help me. gonna call ircCheck() in 60s");
        &clearIRCVars();
        &ScheduleThis(1, "ircCheck");
-#      &ScheduleThis(10, "ircCheck");
-#      &ScheduleThis(30, "ircCheck");
-    } else {
-       &WARN("on_disconnect: self is undefined! WTF");
-       &DEBUG("running function irc... lets hope this works.");
-       &irc();
     }
 }
 
@@ -395,7 +408,7 @@ sub on_endofnames {
        &status("$b_blue$chan$ob: sync in ${delta_time}s.");
     }
 
-    &rawout("MODE $chan");
+    $conn->mode($chan);
 
     my $txt;
     my @array;
@@ -457,6 +470,11 @@ sub on_join {
     my $i              = scalar(keys %{ $channels{$chan} });
     my $j              = $cache{maxpeeps}{$chan} || 0;
 
+    if (time() > ($sched{shmFlush}{TIME} || time()) + 3600) {
+       &DEBUG("looks like schedulers died somewhere... restarting...");
+       &setupSchedulers();
+    }
+
     $chanstats{$chan}{'Join'}++;
     $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats"));
     $cache{maxpeeps}{$chan}    = $i if ($i > $j);
@@ -539,11 +557,12 @@ sub on_join {
        if (defined( my $whojoin = $cache{join}{$chan} )) {
            &msg($chan, "Okay, I'm here. (courtesy of $whojoin)");
            delete $cache{join}{$chan};
+           &joinNextChan();    # hack.
        }
 
        ### TODO: move this to &joinchan()?
        $cache{jointime}{$chan} = &timeget();
-       rawout("WHO $chan");
+       $conn->who($chan);
 
        return;
     }
@@ -744,6 +763,7 @@ sub on_notice {
 
            $nickserv++;
        }
+
     } elsif ($nick =~ /^ChanServ$/i) {         # chanserv.
        &status("ChanServ: <== '$args'.");
 
@@ -867,6 +887,7 @@ sub on_public {
            $v++;
 
            # don't allow ppl to cheat the stats :-)
+           next unless (defined $t);
            next unless ($time - $t > 10);
 
            my %hash = (
@@ -926,7 +947,7 @@ sub on_quit {
            next unless ( exists $channels{$_}{'l'} );
 
            &DEBUG("on_quit: netsplit detected on $_; disabling chan limit.");
-           &rawout("MODE $_ -l");
+           $conn->mode($_, "-l");
        }
 
        $netsplit{lc $nick} = time();
@@ -1166,7 +1187,8 @@ sub on_chanfull {
     my ($self, $event) = @_;
     my @args   = $event->args;
 
-    &DEBUG("on_chanfull: args => @args");
+    &status(">>> chanfull/$b_blue$args[1]$ob");
+
     &joinNextChan();
 }
 
@@ -1174,15 +1196,18 @@ sub on_inviteonly {
     my ($self, $event) = @_;
     my @args   = $event->args;
 
-    &DEBUG("on_inviteonly: args => @args");
+    &status(">>> inviteonly/$b_cyan$args[1]$ob");
+
     &joinNextChan();
 }
 
 sub on_banned {
     my ($self, $event) = @_;
     my @args   = $event->args;
+    my $chan   = $args[1];
+
+    &status(">>> banned/$b_blue$chan$ob $b_cyan$args[0]$ob");
 
-    &DEBUG("on_banned: args => @args");
     &joinNextChan();
 }
 
@@ -1194,4 +1219,12 @@ sub on_badchankey {
     &joinNextChan();
 }
 
+sub on_useronchan {
+    my ($self, $event) = @_;
+    my @args   = $event->args;
+
+    &DEBUG("on_useronchan: args => @args");
+    &joinNextChan();
+}
+
 1;