- now support verstats for those who don't reply to "CTCP VERSION

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

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 7f2e7f874438a36e3bb035f76da254db2b0462da..985fbacf2c4a6cd9ceec4a3e6c073887a47d2c4c 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -55,6 +55,7 @@ sub on_chat {
     $orig{message}     = $msg;
     $nuh               = $nuh{$who};
     $uh                        = (split /\!/, $nuh)[1];
+    $h                 = (split /\@/, $uh)[1];
     $addressed         = 1;
     $msgType           = 'chat';
 
@@ -188,6 +189,9 @@ sub on_endofmotd {
        @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");
@@ -353,7 +357,8 @@ sub on_disconnect {
     $ircstats{'DisconnectTime'}                = time();
     $ircstats{'DisconnectReason'}      = $what;
     $ircstats{'DisconnectCount'}++;
-    $ircstats{'TotalTime'}     += time() - $ircstats{'ConnectTime'};
+    $ircstats{'TotalTime'}     += time() - $ircstats{'ConnectTime'}
+                                       if ($ircstats{'ConnectTime'});
 
     # clear any variables on reconnection.
     $nickserv = 0;
@@ -361,6 +366,7 @@ sub on_disconnect {
     &clearIRCVars();
     if (!$self->connect()) {
        &WARN("not connected? help me. gonna call ircCheck() in 60s");
+       &clearIRCVars();
        &ScheduleThis(1, "ircCheck");
 #      &ScheduleThis(10, "ircCheck");
 #      &ScheduleThis(30, "ircCheck");
@@ -424,9 +430,10 @@ sub on_invite {
 
     ### TODO: join key.
     if (exists $chanconf{$chan}) {
+       # it's still buggy :/
        if (&validChan($chan)) {
            &msg($who, "i'm already in \002$chan\002.");
-           next;
+#          return;
        }
 
        &status("invited to $b_blue$chan$ob by $b_cyan$nick$ob");
@@ -440,9 +447,12 @@ sub on_join {
     $chan              = lc( ($event->to)[0] ); # CASING!!!!
     $who               = $event->nick();
     $msgType           = "public";
+    my $i              = scalar(keys %{ $channels{$chan} });
+    my $j              = $cache{maxpeeps}{$chan} || 0;
 
     $chanstats{$chan}{'Join'}++;
     $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats"));
+    $cache{maxpeeps}{$chan}    = $i if ($i > $j);
 
     &joinfloodCheck($who, $chan, $event->userhost);
 
@@ -610,6 +620,7 @@ sub on_msg {
     $uh                = $event->userhost();
     $nuh       = $nick."!".$uh;
     $msgtime   = time();
+    $h         = $host;
 
     if ($nick eq $ident) { # hopefully ourselves.
        if ($msg eq "TEST") {
@@ -789,8 +800,14 @@ sub on_ping {
 
 sub on_ping_reply {
     my ($self, $event) = @_;
-    my $nick = $event->nick;
-    my $lag = time() - ($event->args)[1];
+    my $nick   = $event->nick;
+    my $t      = ($event->args)[1];
+    if (!defined $t) {
+       &WARN("on_ping_reply: t == undefined.");
+       return;
+    }
+
+    my $lag = time() - $t;
 
     &status(">>> ${b_green}CTCP PING$ob reply from $b_cyan$nick$ob: $lag sec.");
 }
@@ -806,6 +823,7 @@ sub on_public {
     $msgType   = "public";
     # todo: move this out of hookMsg to here?
     ($user,$host) = split(/\@/, $uh);
+    $h         = $host;
 
     # rare case should this happen - catch it just in case.
     if ($bot_pid != $$) {
@@ -854,7 +872,7 @@ sub on_public {
            );
                
 
-           &dbReplace("stats", %hash);
+           &dbReplace("stats", "nick", %hash);
            # does not work, atleast with old mysql!!! :(
 #          &dbReplace("stats", (nick => $who, type => $x, -counter => "counter+1") );
        }
@@ -878,7 +896,7 @@ sub on_quit {
 ###    $chan   = $reason;      # no.
 
     my $count  = 0;
-    foreach (keys %channels) {
+    foreach (grep !/^_default$/, keys %channels) {
        # fixes inconsistent chanstats bug #1.
        if (!&IsNickInChan($nick,$_)) {
            $count++;
@@ -1030,7 +1048,7 @@ sub on_crversion {
     }
 
     if (grep /^\Q$nick\E$/i, @vernick) {
-       &WARN("nick $nick found in vernick; skipping.");
+       &WARN("nick $nick found in vernick ($ver); skipping.");
        return;
     }
     push(@vernick, $nick);
@@ -1044,17 +1062,17 @@ sub on_crversion {
     } elsif ($ver =~ /irssi/i) {
        $ver{irssi}{$nick}      = $ver;
 
-    } elsif ($ver =~ /epic/i) {
+    } elsif ($ver =~ /epic|(Third Eye)/i) {
        $ver{epic}{$nick}       = $ver;
 
     } elsif ($ver =~ /mirc/i) {
-       &DEBUG("verstats: mirc: $nick => '$ver'.");
+#      &DEBUG("verstats: mirc: $nick => '$ver'.");
        $ver{mirc}{$nick}       = $ver;
 
     } elsif ($ver =~ /ircle/i) {
        $ver{ircle}{$nick}      = $ver;
 
-    } elsif ($ver =~ /ircII/i) {
+    } elsif ($ver =~ /ircII|PhoEniX/i) {
        $ver{ircII}{$nick}      = $ver;
 
     } elsif ($ver =~ /sirc /i) {