X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrcHooks.pl;h=542ba63643a5b28ade0797f1f1babf113e62c241;hb=53a8eb0eab2856fbda8217c2fd77f0d57511e096;hp=2b73053ea96a19038f1a0567f0a243cc8e0edcae;hpb=a62d525d3ade739a66de1780b1cebcbe9bc07511;p=infobot.git

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 2b73053..542ba63 100644
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -4,12 +4,12 @@
 #     Version: 20000126
 #        NOTE: Based on code by Kevin Lenzo & Patrick Cole  (c) 1997
 #
-
-if (&IsParam("useStrict")) { use strict; }
+use vars qw(%chanconf);
 
 # GENERIC. TO COPY.
 sub on_generic {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $nick = $event->nick();
     my $chan = ($event->to)[0];
 
@@ -22,7 +22,8 @@ sub on_generic {
 }
 
 sub on_action {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my ($nick, @args) = ($event->nick, $event->args);
     my $chan = ($event->to)[0];
 
@@ -36,14 +37,15 @@ sub on_action {
 }
 
 sub on_chat {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $msg  = ($event->args)[0];
     my $sock = ($event->to)[0];
     my $nick = lc $event->nick();
 
     if (!exists $nuh{$nick}) {
 	&DEBUG("chat: nuh{$nick} doesn't exist; trying WHOIS .");
-	$self->whois($nick);
+	$conn->whois($nick);
 	return;
     }
 
@@ -55,6 +57,7 @@ sub on_chat {
     $orig{message}	= $msg;
     $nuh		= $nuh{$who};
     $uh			= (split /\!/, $nuh)[1];
+    $h			= (split /\@/, $uh)[1];
     $addressed		= 1;
     $msgType		= 'chat';
 
@@ -63,18 +66,23 @@ sub on_chat {
 	my $crypto	= $users{$userHandle}{PASS};
 	my $success	= 0;
 
+	if ($userHandle eq "_default") {
+	    &WARN("DCC CHAT: _default/guest not allowed.");
+	    return;
+	}
+
 	### TODO: prevent users without CRYPT chatting.
 	if (!defined $crypto) {
-	    &DEBUG("todo: dcc close chat");
+	    &TODO("dcc close chat");
 	    &msg($who, "nope, no guest logins allowed...");
 	    return;
 	}
 
 	if (&ckpasswd($msg, $crypto)) {
 	    # stolen from eggdrop.
-	    $self->privmsg($sock, "Connected to $ident");
-	    $self->privmsg($sock, "Commands start with '.' (like '.quit' or '.help')");
-	    $self->privmsg($sock, "Everything else goes out to the party line.");
+	    $conn->privmsg($sock, "Connected to $ident");
+	    $conn->privmsg($sock, "Commands start with '.' (like '.quit' or '.help')");
+	    $conn->privmsg($sock, "Everything else goes out to the party line.");
 
 	    &dccStatus(2) unless (exists $sched{"dccStatus"}{RUNNING});
 
@@ -85,7 +93,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?
 	}
 
@@ -107,7 +115,7 @@ sub on_chat {
 
     if ($message =~ s/^\.//) {	# dcc chat commands.
 	### TODO: make use of &Forker(); here?
-	&loadMyModule( $myModules{'ircdcc'} );
+	&loadMyModule('UserDCC');
 
 	&DCCBroadcast("#$who# $message","m");
 
@@ -119,7 +127,7 @@ sub on_chat {
 
     } else {			# dcc chat arena.
 
-	foreach (keys %{$dcc{'CHAT'}}) {
+	foreach (keys %{ $dcc{'CHAT'} }) {
 	    $conn->privmsg($dcc{'CHAT'}{$_}, "<$who> $orig{message}");
 	}
     }
@@ -127,30 +135,43 @@ sub on_chat {
     return 'DCC CHAT MESSAGE';
 }
 
+# is there isoff? how do we know if someone signs off?
+sub on_ison {
+    $conn = shift(@_);
+    my ($event) = @_;
+    my $x1 = ($event->args)[0];
+    my $x2 = ($event->args)[1];
+    $x2 =~ s/\s$//;
+
+    &DEBUG("on_ison: x1 = '$x1', x2 => '$x2'");
+}
+
 sub on_endofmotd {
-    my ($self) = @_;
+    $conn = shift(@_);
 
-    # what's the following for?
-    $ident			= $param{'ircNick'};
     # update IRCStats.
+    $ident = $conn->nick();
     $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}) {
-	&status("First time run... adding _default user.");
-	$users{_default}{FLAGS}	= "mrt";
-	$users{_default}{HOSTS} = "*!*@*";
+	&status("!!! First time run... adding _default user.");
+	$users{_default}{FLAGS}	= "amrt";
+	$users{_default}{HOSTS}{"*!*@*"} = 1;
     }
 
     if (scalar keys %users < 2) {
-	&status("Ok... now /msg $ident PASS <pass> to get master access through DCC CHAT.");
+	&status("!"x40);
+	&status("!!! Ok.  Now type '/msg $ident PASS <pass>' to get master access through DCC CHAT.");
+	&status("!"x40);
     }
     # end of first time run.
 
-    if (&IsChanConf("wingate")) {
+    if (&IsChanConf('Wingate')) {
 	my $file = "$bot_base_dir/$param{'ircUser'}.wingate";
 	open(IN, $file);
 	while (<IN>) {
@@ -162,32 +183,59 @@ sub on_endofmotd {
     }
 
     if ($firsttime) {
-	&ScheduleThis(1, \&setupSchedulers);
+	&ScheduleThis(1, "setupSchedulers");
 	$firsttime = 0;
     }
 
     if (&IsParam("ircUMode")) {
-	&status("Attempting change of user modes to $param{'ircUMode'}.");
+	&VERB("Attempting change of user modes to $param{'ircUMode'}.", 2);
+	if ($param{'ircUMode'} !~ /^[-+]/) {
+	    &WARN("ircUMode had no +- prefix; adding +");
+	    $param{'ircUMode'} = "+".$param{'ircUMode'};
+	}
+
 	&rawout("MODE $ident $param{'ircUMode'}");
     }
 
-    &status("End of motd. Now lets join some channels...");
-    if (!scalar @joinchan) {
-	&WARN("joinchan array is empty!!!");
-	@joinchan = &getJoinChans();
+    # ok, we're free to do whatever we want now. go for it!
+    $running = 1;
+
+    # add ourself to notify.
+    $conn->ison($conn->nick());
+
+    # 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();
+    &status("End of motd. Now lets join some channels...");
+    #&joinNextChan();
+}
+
+sub on_endofwho {
+    $conn = shift(@_);
+    my ($event) = @_;
+#    &DEBUG("endofwho: chan => $chan");
+    $chan	||= ($event->args)[1];
+#    &DEBUG("endofwho: chan => $chan");
+
+    if (exists $cache{countryStats}) {
+	&do_countrystats();
+    }
 }
 
 sub on_dcc {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $type = uc( ($event->args)[1] );
     my $nick = lc $event->nick();
 
+    &status("on_dcc type=$type nick=$nick sock=$sock");
+
     # pity Net::IRC doesn't store nuh. Here's a hack :)
     if (!exists $nuh{lc $nick}) {
-	$self->whois($nick);
+	$conn->whois($nick);
 	$nuh{$nick}	= "GETTING-NOW";	# trying.
     }
     $type ||= "???";
@@ -195,28 +243,31 @@ sub on_dcc {
     if ($type eq 'SEND') {	# GET for us.
 	# incoming DCC SEND. we're receiving a file.
 	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
-	);
+	&status("DCC: not Initializing GET from $nick to '$param{tempDir}/$get'");
+	# FIXME: do we want to get anything?
+	return;
+	#open(DCCGET,">$param{tempDir}/$get");
+	#$conn->new_get($event, \*DCCGET);
+
     } elsif ($type eq 'GET') {	# SEND for us?
-	&status("DCC: Initializing SEND for $nick.");
-	$self->new_send($event->args);
+	&status("DCC: not Initializing SEND for $nick.");
+	# FIXME: do we want to do anything?
+	return;
+	$conn->new_send($event->args);
+
     } elsif ($type eq 'CHAT') {
 	&status("DCC: Initializing CHAT for $nick.");
-	$self->new_chat($event);
+	$conn->new_chat($event);
+#	$conn->new_chat(1, $nick, $event->host);
+
     } else {
 	&WARN("${b_green}DCC $type$ob (1)");
     }
 }
 
 sub on_dcc_close {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $nick = $event->nick();
     my $sock = ($event->to)[0];
 
@@ -229,7 +280,7 @@ sub on_dcc_close {
     if (exists $dcc{'SEND'}{$nick} and -f "$param{tempDir}/$nick.txt") {
 	&status("${b_green}DCC SEND$ob close from $b_cyan$nick$ob");
 
-	&status("dcc_close: purging $nick.txt from Debian.pl");
+	&status("dcc_close: purging DCC send $nick.txt");
 	unlink "$param{tempDir}/$nick.txt";
 
 	delete $dcc{'SEND'}{$nick};
@@ -243,11 +294,14 @@ sub on_dcc_close {
 }
 
 sub on_dcc_open {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $type = uc( ($event->args)[0] );
     my $nick = lc $event->nick();
     my $sock = ($event->to)[0];
 
+    &status("on_dcc_open type=$type nick=$nick sock=$sock");
+
     $msgType = 'chat';
     $type ||= "???";
     ### BUG: who is set to bot's nick?
@@ -267,14 +321,13 @@ sub on_dcc_open {
 	}
 
     } elsif ($type eq 'SEND') {
-	&DEBUG("Starting DCC receive.");
+	&status("Starting DCC receive.");
 	foreach ($event->args) {
-	    &DEBUG("  => '$_'.");
+	    &status("  => '$_'.");
 	}
 
     } else {
 	&WARN("${b_green}DCC $type$ob (3)");
-
     }
 }
 
@@ -284,7 +337,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;
     }
 
@@ -293,54 +346,77 @@ sub on_dcc_open_chat {
     &verifyUser($nick, $nuh{lc $nick});
 
     if (!exists $users{$userHandle}{HOSTS}) {
-	&pSReply("you have no hosts defined in my user file; rejecting.");
-	### TODO: $sock->close();
+	&performStrictReply("you have no hosts defined in my user file; rejecting.");
+	$sock->close();
 	return;
     }
 
     my $crypto	= $users{$userHandle}{PASS};
     $dcc{'CHAT'}{$nick} = $sock;
 
+    # TODO: don't make DCC CHAT established in the first place.
+    if ($userHandle eq "_default") {
+	&dccsay($nick, "_default/guest not allowed");
+	$sock->close();
+	return;
+    }
+
     if (defined $crypto) {
+	&status("DCC CHAT: going to use ".$nick."'s crypt.");
 	&dccsay($nick,"Enter your password.");
     } else {
-	&dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
+#	&dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
     }
 }
 
 sub on_disconnect {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $from = $event->from();
     my $what = ($event->args)[0];
+    my $mynick=$conn->nick();
 
-    &status("disconnect from $from ($what).");
+    &status("$mynick disconnect from $from ($what).");
     $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;
 
     &clearIRCVars();
-    if (!$self->connect()) {
-	&WARN("not connected? help me. gonna call ircCheck() in 1800s");
-	&ScheduleThis(30, "ircCheck");
+
+    if (!defined $conn) {
+	&WARN("on_disconnect: self is undefined! WTF");
+	&DEBUG("running function irc... lets hope this works.");
+	&irc();
+	return;
     }
+
+    &WARN("scheduling call ircCheck() in 60s");
+    &clearIRCVars();
+    &ScheduleThis(1, "ircCheck");
 }
 
 sub on_endofnames {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $chan = ($event->args)[1];
 
+    # 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});
-	$delta_time    = 0	if ($delta_time < 0);
+	my $delta_time = sprintf("%.03f", &timedelta($cache{jointime}{$chan}) );
+	$delta_time    = 0	if ($delta_time <= 0);
+	if ($delta_time > 100) {
+	    &WARN("endofnames: delta_time > 100 ($delta_time)");
+	}
 
 	&status("$b_blue$chan$ob: sync in ${delta_time}s.");
     }
 
-    rawout("MODE $chan");
+    $conn->mode($chan);
 
     my $txt;
     my @array;
@@ -357,24 +433,14 @@ sub on_endofnames {
     my $chanstats = join(' || ', @array);
     &status("$b_blue$chan$ob: [$chanstats]");
 
-    if (scalar @joinchan) {	# remaining channels to join.
-	&joinNextChan();
-    } else {
-	&DEBUG("running ircCheck to get chanserv ops.");
-	&ircCheck();
-    }
-
-    return unless (&IsChanConf("chanServ_ops") > 0);
-    return unless ($nickserv);
-
-    if (!exists $channels{$chan}{'o'}{$ident}) {
-	&status("ChanServ ==> Requesting ops for $chan.");
-	&rawout("PRIVMSG ChanServ :OP $chan $ident");
-    }
+    &chanServCheck($chan);
+    # schedule used to solve ircu (OPN) "target too fast" problems.
+    $conn->schedule(5, sub { &joinNextChan(); } );
 }
 
 sub on_init {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my (@args) = ($event->args);
     shift @args;
 
@@ -382,7 +448,8 @@ sub on_init {
 }
 
 sub on_invite {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $chan = lc( ($event->args)[0] );
     my $nick = $event->nick;
 
@@ -393,26 +460,35 @@ 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$_$ob by $b_cyan$who$ob");
-	&joinchan($self, $_);
+	&status("invited to $b_blue$chan$ob by $b_cyan$nick$ob");
+	&joinchan($chan);
     }
 }
 
 sub on_join {
-    my ($self, $event) = @_;
-    my ($user,$host) = split(/\@/, $event->userhost);
-    $chan	= lc( ($event->to)[0] );	# CASING!!!!
-    $who	= $event->nick();
-# doesn't work properly, for news :(
-#    $msgType	= "private";	# for &IsChanConf().
+    $conn = shift(@_);
+    my ($event)	= @_;
+    my ($user,$host)	= split(/\@/, $event->userhost);
+    $chan		= lc( ($event->to)[0] ); # CASING!!!!
+    $who		= $event->nick();
+    $msgType		= "public";
+    my $i		= scalar(keys %{ $channels{$chan} });
+    my $j		= $cache{maxpeeps}{$chan} || 0;
+
+    if (!&IsParam("noSHM") && 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"));
+    $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats") > 0);
+    $cache{maxpeeps}{$chan}	= $i if ($i > $j);
 
     &joinfloodCheck($who, $chan, $event->userhost);
 
@@ -421,16 +497,23 @@ sub on_join {
     if (exists $netsplit{lc $who}) {
 	delete $netsplit{lc $who};
 	$netsplit = 1;
+
+	if (!scalar keys %netsplit) {
+	    &DEBUG("on_join: netsplit hash is now empty!");
+	    undef %netsplitservers;
+	    &netsplitCheck();	# any point in running this?
+	    &chanlimitCheck();
+	}
     }
 
-    if ($netsplit and !$netsplittime) {
-	&DEBUG("on_join: ok.... re-running chanlimitCheck in 60.");
+    if ($netsplit and !exists $cache{netsplit}) {
+	&VERB("on_join: ok.... re-running chanlimitCheck in 60.",2);
 	$conn->schedule(60, sub {
 		&chanlimitCheck();
-		$netsplittime = undef;
+		delete $cache{netsplit};
 	} );
 
-	$netsplittime = time();
+	$cache{netsplit} = time();
     }
 
     # how to tell if there's a netjoin???
@@ -446,7 +529,8 @@ sub on_join {
     ### on-join bans.
     my @bans;
     push(@bans, keys %{ $bans{$chan} }) if (exists $bans{$chan});
-    push(@bans, keys %{ $bans{"*"} })  if (exists $bans{"*"});
+    push(@bans, keys %{ $bans{"*"} })   if (exists $bans{"*"});
+
     foreach (@bans) {
 	my $ban	= $_;
 	s/\?/./g;
@@ -479,45 +563,51 @@ sub on_join {
     # no need to go further.
     return if ($netsplit);
 
+    # who == bot.
+    if ($who =~ /^\Q$ident\E$/i) {
+	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();
+	$conn->who($chan);
+
+	return;
+    }
+
     ### ROOTWARN:
-    &rootWarn($who,$user,$host,$chan)
-		if (&IsChanConf("rootWarn") &&
-		    $user =~ /^r(oo|ew|00)t$/i &&
-		    $channels{$chan}{'o'}{$ident});
+    &rootWarn($who,$user,$host,$chan) if (
+		&IsChanConf('RootWarn') &&
+		$user =~ /^~?r(oo|ew|00)t$/i
+    );
 
-    ### NEWS:
-    # why isn't this "enabled" just as someone joins?
+    ### emit a message based on who just joined
+	 &onjoin($who,$user,$host,$chan) if (&IsChanConf('OnJoin'));
 
-    if (&IsChanConf("news") && &IsChanConf("newsKeepRead")) {
-	if (!&loadMyModule("news")) {	# just in case.
-	    &DEBUG("could not load news.");
+    ### NEWS:
+    if (&IsChanConf('News') && &IsChanConf('newsKeepRead')) {
+	if (!&loadMyModule('News')) {	# just in case.
+	    &DEBUG('could not load news.');
 	} else {
 	    &News::latest($chan);
 	}
     }
 
-    ### chanlimit check.
-    &chanLimitVerify($chan);
-
-    # used to determine sync time.
-    if ($who =~ /^$ident$/i) {
-	if (defined( my $whojoin = $cache{join}{$chan} )) {
-	    &msg($chan, "Okay, I'm here. (courtesy of $whojoin)");
-	    delete $cache{join}{$chan};
-	}
-
-	### TODO: move this to &joinchan()?
-	$cache{jointime}{$chan} = &gettimeofday();
-	rawout("WHO $chan");
-    } else {
-	### TODO: this may go wild on a netjoin :)
-	### WINGATE:
-	&wingateCheck();
+    ### botmail:
+    if (&IsChanConf('botmail')) {
+	&botmail::check(lc $who);
     }
+
+    ### wingate:
+    &wingateCheck();
 }
 
 sub on_kick {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my ($chan,$reason) = $event->args;
     my $kicker	= $event->nick;
     my $kickee	= ($event->to)[0];
@@ -534,37 +624,42 @@ sub on_kick {
 	&status("SELF attempting to rejoin lost channel $chan");
 	&joinchan($chan);
     } else {
-	&DeleteUserInfo($kickee,$chan);
+	&delUserInfo($kickee,$chan);
     }
 }
 
 sub on_mode {
-    my ($self, $event)	= @_;
+    $conn = shift(@_);
+    my ($event)	= @_;
     my ($user, $host)	= split(/\@/, $event->userhost);
-    my @args = $event->args();
-    my $nick = $event->nick();
-    my $chan = ($event->to)[0];
+    my @args	= $event->args();
+    my $nick	= $event->nick();
+    $chan	= ($event->to)[0];
 
-    $args[0] =~ s/\s$//;
+    # last element is empty... so nuke it.
+    pop @args while ($args[$#args] eq "");
 
     if ($nick eq $chan) {	# UMODE
 	&status(">>> mode $b_yellow\[$ob$b@args$b_yellow\]$ob by $b_cyan$nick$ob");
     } else {			# MODE
 	&status(">>> mode/$b_blue$chan$ob $b_yellow\[$ob$b@args$b_yellow\]$ob by $b_cyan$nick$ob");
-	&hookMode($chan, @args);
+	&hookMode($nick, @args);
     }
 }
 
 sub on_modeis {
-    my ($self, $event) = @_;
-    my $nick = $event->nick();
-    my ($myself,$chan,@args) = $event->args();
+    $conn = shift(@_);
+    my ($event) = @_;
+    my ($myself, undef,@args) = $event->args();
+    my $nick	= $event->nick();
+    $chan	= ($event->args())[1];
 
-    &hookMode(lc $chan, @args);		# CASING.
+    &hookMode($nick, @args);
 }
 
 sub on_msg {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $nick = $event->nick;
     my $msg  = ($event->args)[0];
 
@@ -572,6 +667,7 @@ sub on_msg {
     $uh		= $event->userhost();
     $nuh	= $nick."!".$uh;
     $msgtime	= time();
+    $h		= $host;
 
     if ($nick eq $ident) { # hopefully ourselves.
 	if ($msg eq "TEST") {
@@ -582,10 +678,14 @@ sub on_msg {
     }
 
     &hookMsg('private', undef, $nick, $msg);
+    $who	= "";
+    $chan	= "";
+    $msgType	= "";
 }
 
 sub on_names {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my @args = $event->args;
     my $chan = lc $args[2];		# CASING, the last of them!
 
@@ -597,48 +697,64 @@ sub on_names {
 }
 
 sub on_nick {
-    my ($self, $event) = @_;
-    my $nick = $event->nick();
+    $conn = shift(@_);
+    my ($event) = @_;
+    my $nick	= $event->nick();
     my $newnick = ($event->args)[0];
 
     if (exists $netsplit{lc $newnick}) {
 	&status("Netsplit: $newnick/$nick came back from netsplit and changed to original nick! removing from hash.");
 	delete $netsplit{lc $newnick};
+	&netsplitCheck() if (time() != $sched{netsplitCheck}{TIME});
     }
 
     my ($chan,$mode);
     foreach $chan (keys %channels) {
-	foreach $mode (keys %{$channels{$chan}}) {
+	foreach $mode (keys %{ $channels{$chan} }) {
 	    next unless (exists $channels{$chan}{$mode}{$nick});
 
 	    $channels{$chan}{$mode}{$newnick} = $channels{$chan}{$mode}{$nick};
 	}
     }
-    &DeleteUserInfo($nick,keys %channels);
+    # TODO: do %flood* aswell.
+
+    &delUserInfo($nick, keys %channels);
     $nuh{lc $newnick} = $nuh{lc $nick};
     delete $nuh{lc $nick};
 
-    # successful self-nick change.
-    if ($nick eq $ident) {
+    if ($nick eq $conn->nick()) {
 	&status(">>> I materialized into $b_green$newnick$ob from $nick");
 	$ident = $newnick;
+	$conn->nick($newnick);
     } else {
 	&status(">>> $b_cyan$nick$ob materializes into $b_green$newnick$ob");
+	my $mynick=$conn->nick();
+	if ($nick =~ /^\Q$mynick\E$/i) {
+	    &getNickInUse();
+	}
     }
 }
 
 sub on_nick_taken {
-    my ($self) = @_;
-    my $nick = $self->nick;
-    my $newnick = substr($nick,0,7)."-";
+    $conn = shift(@_);
+    my $nick	= $conn->nick();
+    #my $newnick = $nick . int(rand 10);
+    my $newnick = $nick . "_";
+
+    &DEBUG("on_nick_taken: nick => $nick");
 
-    &status("nick taken; changing to temporary nick.");
-    &nick($newnick);
-    &getNickInUse(1);
+    &status("nick taken ($nick); preparing nick change.");
+
+    $conn->whois($nick);
+    #$conn->schedule(5, sub {
+	&status("nick taken; changing to temporary nick ($nick -> $newnick).");
+	&nick($newnick);
+    #} );
 }
 
 sub on_notice {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $nick = $event->nick();
     my $chan = ($event->to)[0];
     my $args = ($event->args)[0];
@@ -652,6 +768,7 @@ sub on_notice {
 
 	if ($check) {
 	    &status("nickserv told us to register; doing it.");
+
 	    if (&IsParam("nickServ_pass")) {
 		&status("NickServ: ==> Identifying.");
 		&rawout("PRIVMSG NickServ :IDENTIFY $param{'nickServ_pass'}");
@@ -663,10 +780,21 @@ 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.
 	&status("ChanServ: <== '$args'.");
+
     } else {
 	if ($chan =~ /^$mask{chan}$/) {	# channel notice.
 	    &status("-$nick/$chan- $args");
@@ -678,7 +806,8 @@ sub on_notice {
 }
 
 sub on_other {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $chan = ($event->to)[0];
     my $nick = $event->nick;
 
@@ -687,19 +816,31 @@ sub on_other {
 }
 
 sub on_part {
-    my ($self, $event) = @_;
-    my $chan = lc( ($event->to)[0] );	# CASING!!!
-    my $nick = $event->nick;
+    $conn = shift(@_);
+    my ($event) = @_;
+    $chan	= lc( ($event->to)[0] );	# CASING!!!
+    my $mynick	= $conn->nick();
+    my $nick	= $event->nick;
     my $userhost = $event->userhost;
+    $who	= $nick;
+    $msgType	= "public";
+
+    if (!exists $channels{$chan}) {
+	&DEBUG("on_part: found out $mynick is on $chan!");
+	$channels{$chan} = 1;
+    }
 
     if (exists $floodjoin{$chan}{$nick}{Time}) {
 	delete $floodjoin{$chan}{$nick};
     }
 
     $chanstats{$chan}{'Part'}++;
-    &DeleteUserInfo($nick,$chan);
-    &clearChanVars($chan) if ($nick eq $ident);
-    if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) {
+    &delUserInfo($nick,$chan);
+    if ($nick eq $ident) {
+	&clearChanVars($chan);
+    }
+
+    if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats") > 0) {
 	delete $userstats{lc $nick};
     }
 
@@ -707,71 +848,114 @@ sub on_part {
 }
 
 sub on_ping {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $nick = $event->nick;
 
-    $self->ctcp_reply($nick, join(' ', ($event->args)));
+    $conn->ctcp_reply($nick, join(' ', ($event->args)));
     &status(">>> ${b_green}CTCP PING$ob request from $b_cyan$nick$ob received.");
 }
 
 sub on_ping_reply {
-    my ($self, $event) = @_;
-    my $nick = $event->nick;
-    my $lag = time() - ($event->args)[1];
+    $conn = shift(@_);
+    my ($event) = @_;
+    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.");
 }
 
 sub on_public {
-    my ($self, $event) = @_;
-    my $msg  = ($event->args)[0];
-    my $chan = lc( ($event->to)[0] );	# CASING.
-    my $nick = $event->nick;
-    $uh      = $event->userhost();
-    $nuh     = $nick."!".$uh;
+    $conn = shift(@_);
+    my ($event) = @_;
+    my $msg	= ($event->args)[0];
+    $chan	= lc( ($event->to)[0] );	# CASING.
+    my $nick	= $event->nick;
+    $who	= $nick;
+    $uh		= $event->userhost();
+    $nuh	= $nick."!".$uh;
+    $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 != $$) {
 	&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")) {
+    if (&IsChanConf("seenStats") > 0) {
 	$userstats{lc $nick}{'Count'}++;
 	$userstats{lc $nick}{'Time'} = time();
     }
 
-#    if (&IsChanConf("hehCounter")) {
-#	#...
-#    }
+    # cache it.
+    my $time	= time();
+    if (!$cache{ircTextCounters}) {
+	&DEBUG("caching ircTextCounters for first time.");
+	my @str	= split(/\s+/, &getChanConf("ircTextCounters"));
+	for (@str) { $_ = quotemeta($_); }
+	$cache{ircTextCounters} = join('|', @str);
+    }
+
+    my $str = $cache{ircTextCounters};
+    if ($str && $msg =~ /^($str)[\s!\.]?$/i) {
+	my $x = $1;
+
+	&VERB("textcounters: $x matched for $who",2);
+	my $c = $chan || "PRIVATE";
+
+	# better to do "counter=counter+1".
+	# but that will avoid time check.
+	my ($v,$t) = &sqlSelect("stats", "counter,time", {
+			nick	=> $who,
+			type	=> $x,
+			channel	=> $c,
+	} );
+	$v++;
+
+	# don't allow ppl to cheat the stats :-)
+	if (defined $t && $time - $t > 60) {
+	    &sqlReplace("stats", {
+		nick	=> $who,
+		type	=> $x,
+		channel => $c,
+		time	=> $time,
+		counter => $v,
+	    } );
+	}
+    }
 
     &hookMsg('public', $chan, $nick, $msg);
     $chanstats{$chan}{'PublicMsg'}++;
+    $who	= "";
+    $chan	= "";
+    $msgType	= "";
 }
 
 sub on_quit {
-    my ($self, $event) = @_;
-    my $nick = $event->nick();
-    my $reason = ($event->args)[0];
+    $conn = shift(@_);
+    my ($event) = @_;
+    my $nick	= $event->nick();
+    my $reason	= ($event->args)[0];
+
+    # hack for ICC.
+    $msgType	= "public";
+    $who	= $nick;
+###    $chan	= $reason;	# no.
 
     my $count	= 0;
-    foreach (keys %channels) {
+    foreach (grep !/^_default$/, keys %channels) {
 	# fixes inconsistent chanstats bug #1.
 	if (!&IsNickInChan($nick,$_)) {
 	    $count++;
@@ -784,59 +968,87 @@ sub on_quit {
 	&DEBUG("on_quit: nick $nick was not found in any chan.");
     }
 
-    &DeleteUserInfo($nick, keys %channels);
-
-    if (exists $nuh{lc $nick}) {
-	delete $nuh{lc $nick};
-    } else {
-	&DEBUG("on_quit: nuh{lc $nick} does not exist! FIXME");
-    }
-    delete $userstats{lc $nick} if (&IsChanConf("seenStats"));
-
     # should fix chanstats inconsistencies bug #2.
-    if ($reason=~/^($mask{host})\s($mask{host})$/) {	# netsplit.
+    if ($reason =~ /^($mask{host})\s($mask{host})$/) {	# netsplit.
 	$reason = "NETSPLIT: $1 <=> $2";
 
-	if (&ChanConfList("chanlimitcheck") and !scalar keys %netsplit) {
-	    &DEBUG("on_quit: netsplit detected; disabling chan limit.");
-	    &rawout("MODE $chan -l");
+	# chanlimit code.
+	foreach $chan ( &getNickInChans($nick) ) {
+	    next unless ( &IsChanConf("chanlimitcheck") );
+	    next unless ( exists $channels{$_}{'l'} );
+
+	    &DEBUG("on_quit: netsplit detected on $_; disabling chan limit.");
+	    $conn->mode($_, "-l");
 	}
 
 	$netsplit{lc $nick} = time();
 	if (!exists $netsplitservers{$1}{$2}) {
-	    &status("netsplit detected between $1 and $2.");
+	    &status("netsplit detected between $1 and $2 at [".scalar(gmtime)."]");
 	    $netsplitservers{$1}{$2} = time();
 	}
     }
 
-    &status(">>> $b_cyan$nick$ob has signed off IRC $b_red($ob$reason$b_red)$ob");
-    if ($nick =~ /^\Q$ident\E$/) {
-	&DEBUG("^^^ THIS SHOULD NEVER HAPPEN.");
-    }
+    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$/ and $nick =~ /^\Q$param{'ircNick'}\E$/i) {
-	&status("own nickname became free; changing.");
-	&nick($param{'ircNick'});
+    ###
+    ### ok... lets clear out the cache
+    ###
+    &delUserInfo($nick, keys %channels);
+    if (exists $nuh{lc $nick}) {
+	delete $nuh{lc $nick};
+    } else {
+	# well.. it's good but weird that this has happened - lets just
+	# be quiet about it.
+    }
+    delete $userstats{lc $nick} if (&IsChanConf("seenStats") > 0);
+    delete $chanstats{lc $nick};
+    ###
+
+    # if we have a temp nick, and whoever is camping on our main nick leaves
+    # revert to main nick. Note that Net::IRC only knows our main nick
+    if ($nick eq $conn->nick()) {
+	&status("nickchange: own nick \"$nick\" became free; changing.");
+	&nick($mynick);
     }
 }
 
 sub on_targettoofast {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $nick = $event->nick();
     my($me,$chan,$why) = $event->args();
 
     ### TODO: incomplete.
-###    .* wait (\d+) second/) {
-	&status("on_ttf: X1 $msg") if (defined $msg);
-	my $sleep = 5;
-	&status("targettoofast: going to sleep for $sleep...");
-	sleep $sleep;
-	&joinNextChan();
-### }
+    if ($why =~ /.* wait (\d+) second/) {
+	my $sleep	= $1;
+	my $max		= 10;
+
+	if ($sleep > $max) {
+	    &status("targettoofast: going to sleep for $max ($sleep)...");
+	    $sleep = $max;
+	} else {
+	    &status("targettoofast: going to sleep for $sleep");
+	}
+
+	my $delta = time() - ($cache{sleepTime} || 0);
+	if ($delta > $max+2) {
+	    sleep $sleep;
+	    $cache{sleepTime} = time();
+	}
+
+	return;
+    }
+
+    if (!exists $cache{TargetTooFast}) {
+	&DEBUG("on_ttf: failed: $why");
+	$cache{TargetTooFast}++;
+    }
 }
 
 sub on_topic {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
 
     if (scalar($event->args) == 1) {	# change.
 	my $topic = ($event->args)[0];
@@ -858,7 +1070,7 @@ sub on_topic {
 	&status(">>> topic/$b_blue$chan$ob by $b_cyan$nick$ob -> $topic");
     } else {						# join.
 	my ($nick, $chan, $topic) = $event->args;
-	if (&IsChanConf("topic")) {
+	if (&IsChanConf('Topic')) {
 	    $topic{$chan}{'Current'}	= $topic;
 	    &topicAddHistory($chan,$topic);
 	}
@@ -869,12 +1081,13 @@ sub on_topic {
 }
 
 sub on_topicinfo {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my ($myself,$chan,$setby,$time) = $event->args();
 
     my $timestr;
     if (time() - $time > 60*60*24) {
-	$timestr	= "at ". localtime $time;
+	$timestr	= "at ". gmtime $time;
     } else {
 	$timestr	= &Time2String(time() - $time) ." ago";
     }
@@ -883,7 +1096,8 @@ sub on_topicinfo {
 }
 
 sub on_crversion {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $nick	= $event->nick();
     my $ver;
 
@@ -895,60 +1109,174 @@ 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);
 
     if ($ver =~ /bitchx/i) {
 	$ver{bitchx}{$nick}	= $ver;
+
     } elsif ($ver =~ /xc\!|xchat/i) {
 	$ver{xchat}{$nick}	= $ver;
+
     } elsif ($ver =~ /irssi/i) {
 	$ver{irssi}{$nick}	= $ver;
-    } elsif ($ver =~ /epic/i) {
+
+    } elsif ($ver =~ /epic|(Third Eye)/i) {
 	$ver{epic}{$nick}	= $ver;
+
+    } elsif ($ver =~ /ircII|PhoEniX/i) {
+	$ver{ircII}{$nick}	= $ver;
+
     } elsif ($ver =~ /mirc/i) {
+#	&DEBUG("verstats: mirc: $nick => '$ver'.");
 	$ver{mirc}{$nick}	= $ver;
+
+# ok... then we get to the lesser known/used clients.
     } elsif ($ver =~ /ircle/i) {
 	$ver{ircle}{$nick}	= $ver;
-    } elsif ($ver =~ /ircII/i) {
-	$ver{ircII}{$nick}	= $ver;
+
+    } elsif ($ver =~ /chatzilla/i) {
+	$ver{chatzilla}{$nick}	= $ver;
+
+    } elsif ($ver =~ /pirch/i) {
+	$ver{pirch}{$nick}	= $ver;
+
     } elsif ($ver =~ /sirc /i) {
 	$ver{sirc}{$nick}	= $ver;
+
     } elsif ($ver =~ /kvirc/i) {
 	$ver{kvirc}{$nick}	= $ver;
+
     } elsif ($ver =~ /eggdrop/i) {
 	$ver{eggdrop}{$nick}	= $ver;
+
     } elsif ($ver =~ /xircon/i) {
 	$ver{xircon}{$nick}	= $ver;
+
     } else {
+	&DEBUG("verstats: other: $nick => '$ver'.");
 	$ver{other}{$nick}	= $ver;
     }
 }
 
 sub on_version {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my $nick = $event->nick;
 
     &status(">>> ${b_green}CTCP VERSION$ob request from $b_cyan$nick$ob");
-    $self->ctcp_reply($nick, "VERSION $bot_version");
+    $conn->ctcp_reply($nick, "VERSION $bot_version");
 }
 
 sub on_who {
-    my ($self, $event) = @_;
+    $conn = shift(@_);
+    my ($event) = @_;
     my @args	= $event->args;
+    my $str	= $args[5]."!".$args[2]."\@".$args[3];
+
+    if ($cache{on_who_Hack}) {
+	$cache{nuhInfo}{lc $args[5]}{Nick} = $args[5];
+	$cache{nuhInfo}{lc $args[5]}{User} = $args[2];
+	$cache{nuhInfo}{lc $args[5]}{Host} = $args[3];
+	$cache{nuhInfo}{lc $args[5]}{NUH}  = "$args[5]!$args[2]\@$args[3]";
+	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];
 }
 
-sub on_whoisuser {
-    my ($self, $event) = @_;
+sub on_whois {
+    $conn = shift(@_);
+    my ($event) = @_;
     my @args	= $event->args;
 
-    &DEBUG("on_whoisuser: @args");
-
     $nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3];
 }
 
+sub on_whoischannels {
+    $conn = shift(@_);
+    my ($event) = @_;
+    my @args	= $event->args;
+
+    &DEBUG("on_whoischannels: @args");
+}
+
+sub on_useronchannel {
+    $conn = shift(@_);
+    my ($event) = @_;
+    my @args	= $event->args;
+
+    &DEBUG("on_useronchannel: @args");
+    &joinNextChan();
+}
+
+###
+### since joinnextchan is hooked onto on_endofnames, these are needed.
+###
+
+sub on_chanfull {
+    $conn = shift(@_);
+    my ($event) = @_;
+    my @args	= $event->args;
+
+    &status(">>> chanfull/$b_blue$args[1]$ob");
+
+    &joinNextChan();
+}
+
+sub on_inviteonly {
+    $conn = shift(@_);
+    my ($event) = @_;
+    my @args	= $event->args;
+
+    &status(">>> inviteonly/$b_cyan$args[1]$ob");
+
+    &joinNextChan();
+}
+
+sub on_banned {
+    $conn = shift(@_);
+    my ($event) = @_;
+    my @args	= $event->args;
+    my $chan	= $args[1];
+
+    &status(">>> banned/$b_blue$chan$ob $b_cyan$args[0]$ob, removing autojoin for $chan");
+    delete $chanconf{$chan}{autojoin};
+    &joinNextChan();
+}
+
+sub on_badchankey {
+    $conn = shift(@_);
+    my ($event) = @_;
+    my @args	= $event->args;
+    my $chan	= $args[1];
+
+    &DEBUG("on_badchankey: args => @args, removing autojoin for $chan");
+    delete $chanconf{$chan}{autojoin};
+    &joinNextChan();
+}
+
+sub on_useronchan {
+    $conn = shift(@_);
+    my ($event) = @_;
+    my @args	= $event->args;
+
+    &DEBUG("on_useronchan: args => @args");
+    &joinNextChan();
+}
+
+# TODO not used yet
+sub on_stdin {
+    my $line = <STDIN>;
+    chomp($line);
+    &FIXME("on_stdin: line => \"$line\"");
+}
+
 1;