start of multiple connections

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

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index fa11dab1480d7cb3232dab1c70eb813a775658c5..9c9d87c06f70531924671117d36234add002135f 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -89,7 +89,7 @@ sub on_chat {
            &DEBUG("chat: sock => '$sock'.");
 ###        $sock->close();
            delete $dcc{'CHAT'}{$nick};
-           &DEBUG("chat: after closing sock. FIXME");
+           &FIXME("chat: after closing sock.");
            ### BUG: close seizes bot. why?
        }
 
@@ -136,6 +136,7 @@ sub on_ison {
     my ($self, $event) = @_;
     my $x1 = ($event->args)[0];
     my $x2 = ($event->args)[1];
+    $x2 =~ s/\s$//;
 
 #    &nick( $param{'ircNick'} );
 
@@ -146,11 +147,12 @@ sub on_endofmotd {
     my ($self) = @_;
 
     # update IRCStats.
-    $ident     ||= $param{'ircNick'};  # hack.
+    $ident = $param{'ircNick'};
     $ircstats{'ConnectTime'}   = time();
     $ircstats{'ConnectCount'}++;
-    $ircstats{'OffTime'}       += time() - $ircstats{'DisconnectTime'}
-                       if (defined $ircstats{'DisconnectTime'});
+    if (defined $ircstats{'DisconnectTime'}) {
+       $ircstats{'OffTime'}    += time() - $ircstats{'DisconnectTime'};
+    }
 
     # first time run.
     if (!exists $users{_default}) {
@@ -325,7 +327,7 @@ sub on_dcc_open_chat {
     my(undef, $nick, $sock) = @_;
 
     if ($nuh{$nick} eq "GETTING-NOW") {
-       &DEBUG("getting nuh for $nick failed. FIXME.");
+       &FIXME("getting nuh for $nick failed.");
        return;
     }
 
@@ -372,9 +374,7 @@ sub on_disconnect {
     # clear any variables on reconnection.
     $nickserv = 0;
 
-    &DEBUG("on_disconnect: 1");
     &clearIRCVars();
-    &DEBUG("on_disconnect: 2");
 
     if (!defined $self) {
        &WARN("on_disconnect: self is undefined! WTF");
@@ -474,7 +474,7 @@ sub on_join {
     }
 
     $chanstats{$chan}{'Join'}++;
-    $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats"));
+    $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats") > 0);
     $cache{maxpeeps}{$chan}    = $i if ($i > $j);
 
     &joinfloodCheck($who, $chan, $event->userhost);
@@ -677,7 +677,7 @@ sub on_names {
 
 sub on_nick {
     my ($self, $event) = @_;
-    my $nick = $event->nick();
+    my $nick   = $event->nick();
     my $newnick = ($event->args)[0];
 
     if (exists $netsplit{lc $newnick}) {
@@ -714,7 +714,7 @@ sub on_nick {
 
 sub on_nick_taken {
     my ($self) = @_;
-    my $nick   = $self->nick;
+    my $nick   = $self->nick();
     my $newnick = $nick.int(rand 10);
 
     if ($nick eq $ident) {
@@ -817,7 +817,7 @@ sub on_part {
        &clearChanVars($chan);
     }
 
-    if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) {
+    if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats") > 0) {
        delete $userstats{lc $nick};
     }
 
@@ -868,7 +868,7 @@ sub on_public {
     $msgtime           = time();
     $lastWho{$chan}    = $nick;
     ### TODO: use $nick or lc $nick?
-    if (&IsChanConf("seenStats")) {
+    if (&IsChanConf("seenStats") > 0) {
        $userstats{lc $nick}{'Count'}++;
        $userstats{lc $nick}{'Time'} = time();
     }
@@ -899,7 +899,7 @@ sub on_public {
        $v++;
 
        # don't allow ppl to cheat the stats :-)
-       if (defined $t && $time - $t > 60) { 
+       if (defined $t && $time - $t > 60) {
            &sqlReplace("stats", {
                nick    => $who,
                type    => $x,
@@ -977,14 +977,14 @@ sub on_quit {
        # well.. it's good but weird that this has happened - lets just
        # be quiet about it.
     }
-    delete $userstats{lc $nick} if (&IsChanConf("seenStats"));
+    delete $userstats{lc $nick} if (&IsChanConf("seenStats") > 0);
     delete $chanstats{lc $nick};
     ###
 
     # does this work?
     if ($nick !~ /^\Q$ident\E$/ and $nick =~ /^\Q$param{'ircNick'}\E$/i) {
        &status("nickchange: own nickname became free; changing.");
-       &nick($param{'ircNick'});
+       &nick( $param{'ircNick'} );
     }
 }