- force $ident on endofmotd.

- minor cleanup.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@787 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index fa11dab1480d7cb3232dab1c70eb813a775658c5..8623d87fb29cb13cb016617e162b752a067bf7a2 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -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}) {
@@ -677,7 +679,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 +716,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) {
@@ -984,7 +986,7 @@ sub on_quit {
     # 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'} );
     }
 }