- show total commands used in "status"

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

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index facce2956494632472da5795192316ac62195f14..951991855d1d7853027f2ba959742f87974218d4 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -130,9 +130,8 @@ sub on_chat {
 sub on_endofmotd {
     my ($self) = @_;
 
-    # what's the following for?
-    $ident                     = $param{'ircNick'};
     # update IRCStats.
+    $ident     ||= $param{'ircNick'};  # hack.
     $ircstats{'ConnectTime'}   = time();
     $ircstats{'ConnectCount'}++;
     $ircstats{'OffTime'}       += time() - $ircstats{'DisconnectTime'}
@@ -356,7 +355,7 @@ sub on_endofnames {
 
     # sync time should be done in on_endofwho like in BitchX
     if (exists $cache{jointime}{$chan}) {
-       my $delta_time = sprintf("%.03f", &gettimeofday() - $cache{jointime}{$chan});
+       my $delta_time = sprintf("%.03f", &timeget() - $cache{jointime}{$chan});
        $delta_time    = 0      if ($delta_time < 0);
 
        &status("$b_blue$chan$ob: sync in ${delta_time}s.");
@@ -495,7 +494,7 @@ sub on_join {
        }
 
        ### TODO: move this to &joinchan()?
-       $cache{jointime}{$chan} = &gettimeofday();
+       $cache{jointime}{$chan} = &timeget();
        rawout("WHO $chan");
 
        return;
@@ -517,7 +516,7 @@ sub on_join {
     }
 
     ### chanlimit check.
-    &chanLimitVerify($chan);
+#    &chanLimitVerify($chan);
 
     ### wingate:
     &wingateCheck();
@@ -541,7 +540,7 @@ sub on_kick {
        &status("SELF attempting to rejoin lost channel $chan");
        &joinchan($chan);
     } else {
-       &DeleteUserInfo($kickee,$chan);
+       &delUserInfo($kickee,$chan);
     }
 }
 
@@ -627,35 +626,34 @@ sub on_nick {
     }
     # todo: do %flood* aswell.
 
-    &DeleteUserInfo($nick,keys %channels);
+    &delUserInfo($nick, keys %channels);
     $nuh{lc $newnick} = $nuh{lc $nick};
     delete $nuh{lc $nick};
 
-    # successful self-nick change.
-    &DEBUG("on_nick... nick => $nick, ident => $ident");
-    if ($ident eq "$nick-" or "$ident-" eq $nick) {
-       &DEBUG("on_nick: well... we need this bug fixed.");
-       &DEBUG("ident => $ident");
-       &DEBUG("nick => $nick");
-       $ident = $newnick;
-    }
-
     if ($nick eq $ident) {
        &status(">>> I materialized into $b_green$newnick$ob from $nick");
-       $ident = $newnick;
+       $ident  = $newnick;
     } else {
        &status(">>> $b_cyan$nick$ob materializes into $b_green$newnick$ob");
+
+       if ($nick =~ /^\Q$param{'ircNick'}\E$/i) {
+           &getNickInUse();
+       }
     }
 }
 
 sub on_nick_taken {
-    my ($self) = @_;
-    my $nick = $self->nick;
-    my $newnick = substr($nick,0,7)."-";
+    my ($self) = @_;
+    my $nick   = $self->nick;
+    my $newnick = $nick."-";
+
+    &status("nick taken ($nick); preparing nick change.");
 
-    &status("nick taken; changing to temporary nick ($nick -> $newnick).");
-    &nick($newnick);
-    &getNickInUse(1);
+    $self->whois($nick);
+    $conn->schedule(5, sub {
+       &status("nick taken; changing to temporary nick ($nick -> $newnick).");
+       &nick($newnick);
+    } );
 }
 
 sub on_notice {
@@ -684,6 +682,15 @@ sub on_notice {
 
        # password accepted.
        if ($args =~ /^Password a/i) {
+           my $done    = 0;
+
+           foreach ( &ChanConfList("chanServ_ops") ) {
+               next unless &chanServCheck($_);
+               next if ($done);
+               &DEBUG("nickserv activated or restarted; doing chanserv check.");
+               $done++;
+           }
+
            $nickserv++;
        }
     } elsif ($nick =~ /^ChanServ$/i) {         # chanserv.
@@ -720,7 +727,7 @@ sub on_part {
     }
 
     $chanstats{$chan}{'Part'}++;
-    &DeleteUserInfo($nick,$chan);
+    &delUserInfo($nick,$chan);
     &clearChanVars($chan) if ($nick eq $ident);
     if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) {
        delete $userstats{lc $nick};
@@ -757,26 +764,14 @@ sub on_public {
     # todo: move this out of hookMsg to here?
     ($user,$host) = split(/\@/, $uh);
 
+    # rare case should this happen - catch it just in case.
     if ($bot_pid != $$) {
        &ERROR("run-away fork; exiting.");
        &delForked($forker);
     }
 
-    ### DEBUGGING.
-    if ($statcount < 200) {
-       foreach $chan (grep /[A-Z]/, keys %channels) {
-           &DEBUG("leak: chan => '$chan'.");
-           my ($i,$j);
-           foreach $i (keys %{ $channels{$chan} }) {  
-               foreach (keys %{ $channels{$chan}{$i} }) {
-                   &DEBUG("leak:   \$channels{$chan}{$i}{$_} ...");
-               }
-           }
-       }
-    }
-
-    $msgtime = time();
-    $lastWho{$chan} = $nick;
+    $msgtime           = time();
+    $lastWho{$chan}    = $nick;
     ### TODO: use $nick or lc $nick?
     if (&IsChanConf("seenStats")) {
        $userstats{lc $nick}{'Count'}++;
@@ -818,7 +813,7 @@ sub on_quit {
        &DEBUG("on_quit: nick $nick was not found in any chan.");
     }
 
-    &DeleteUserInfo($nick, keys %channels);
+    &delUserInfo($nick, keys %channels);
 
     if (exists $nuh{lc $nick}) {
        delete $nuh{lc $nick};
@@ -832,8 +827,9 @@ sub on_quit {
     if ($reason =~ /^($mask{host})\s($mask{host})$/) { # netsplit.
        $reason = "NETSPLIT: $1 <=> $2";
 
+       # chanlimit code.
        if (&ChanConfList("chanlimitcheck") and !scalar keys %netsplit) {
-           &DEBUG("on_quit: netsplit detected; disabling chan limit.");
+           &DEBUG("on_quit: netsplit detected on $chan; disabling chan limit.");
            &rawout("MODE $chan -l");
        }
 
@@ -844,9 +840,10 @@ sub on_quit {
        }
     }
 
-    &status(">>> $b_cyan$nick$ob has signed off IRC $b_red($ob$reason$b_red)$ob");
+    my $chans = join(' ', &getNickInChans($nick) );
+    &status(">>> $b_cyan$nick$ob has signed off IRC $b_red($ob$reason$b_red)$ob [$chans]");
     if ($nick =~ /^\Q$ident\E$/) {
-       &DEBUG("^^^ THIS SHOULD NEVER HAPPEN.");
+       &ERROR("^^^ THIS SHOULD NEVER HAPPEN (10).");
     }
 
     if ($nick !~ /^\Q$ident\E$/ and $nick =~ /^\Q$param{'ircNick'}\E$/i) {
@@ -1000,6 +997,11 @@ sub on_who {
        return;
     }
 
+    if ($args[5] =~ /^nickserv$/i and !$nickserv) {
+       &DEBUG("ok... we did a who for nickserv.");
+       &rawout("PRIVMSG NickServ :IDENTIFY $param{'nickServ_pass'}");
+    }
+
     $nuh{lc $args[5]} = $args[5]."!".$args[2]."\@".$args[3];
 }