X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrcHooks.pl;h=125ba7cb45754fed35edf1950ec68cf463f913ff;hb=130fc9d79663d571b32c8a625e3487e7b42c10da;hp=02f3bde0b6348ef187ba449742cf2c270b74e7a2;hpb=ac85053bac485702eed242949ca8c96efe2a6395;p=infobot.git

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 02f3bde..125ba7c 100644
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -7,8 +7,6 @@
 
 if (&IsParam("useStrict")) { use strict; }
 
-my $nickserv	= 0;
-
 # GENERIC. TO COPY.
 sub on_generic {
     my ($self, $event) = @_;
@@ -41,66 +39,93 @@ sub on_chat {
     my ($self, $event) = @_;
     my $msg  = ($event->args)[0];
     my $sock = ($event->to)[0];
-    my $nick = $event->nick();
+    my $nick = lc $event->nick();
 
-    if (!exists $nuh{lc $nick}) {
-	&DEBUG("chat: nuh{$nick} doesn't exist; hrm should retry.");
-	&msg($nick, "could not get whois info?");
+    if (!exists $nuh{$nick}) {
+	&DEBUG("chat: nuh{$nick} doesn't exist; trying WHOIS .");
+	$self->whois($nick);
 	return;
-    } else {
-	$message	= $msg;
-	$who		= lc $nick;
-	$orig{who}	= $nick;
-	$orig{message}	= $msg;
-	$nuh		= $nuh{$who};
-	$uh		= (split /\!/, $nuh)[1];
-	$addressed	= 1;
-	$msgType	= 'chat';
     }
 
-    if (!exists $dcc{'CHAT'}{$nick}) {
+    ### set vars that would have been set in hookMsg.
+    $userHandle		= "";	# reset.
+    $who		= lc $nick;
+    $message		= $msg;
+    $orig{who}		= $nick;
+    $orig{message}	= $msg;
+    $nuh		= $nuh{$who};
+    $uh			= (split /\!/, $nuh)[1];
+    $h			= (split /\@/, $uh)[1];
+    $addressed		= 1;
+    $msgType		= 'chat';
+
+    if (!exists $dcc{'CHATvrfy'}{$nick}) {
 	$userHandle	= &verifyUser($who, $nuh);
-	my $crypto	= $userList{$userHandle}{'pass'};
+	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("chat: no pass required.");
-	    $success++;
-	} elsif (&ckpasswd($msg, $crypto)) {
-	    $self->privmsg($sock,"Authorized.");
-	    $self->privmsg($sock,"I'll respond as if through /msg and addressed in public. Addition to that, access to 'user' commands will be allowed, like 'die' and 'jump'.");
-	    # hrm... it's stupid to ask for factoids _within_ dcc chat.
-	    # perhaps it should be default to commands, especially
-	    # commands only authorized through DCC CHAT.
-	    &status("DCC CHAT: passwd is ok.");
+	    &DEBUG("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.");
+
+	    &dccStatus(2) unless (exists $sched{"dccStatus"}{RUNNING});
+
 	    $success++;
+
 	} else {
 	    &status("DCC CHAT: incorrect pass; closing connection.");
 	    &DEBUG("chat: sock => '$sock'.");
 ###	    $sock->close();
+	    delete $dcc{'CHAT'}{$nick};
 	    &DEBUG("chat: after closing sock. FIXME");
 	    ### BUG: close seizes bot. why?
 	}
 
 	if ($success) {
 	    &status("DCC CHAT: user $nick is here!");
-	    $dcc{'CHAT'}{$nick} = $sock;
-	    &DCCBroadcast("$nick ($uh) has joined the chat arena.");
+	    &DCCBroadcast("*** $nick ($uh) joined the party line.");
+
+	    $dcc{'CHATvrfy'}{$nick} = $userHandle;
+
+	    return if ($userHandle eq "_default");
+
+	    &dccsay($nick,"Flags: $users{$userHandle}{FLAGS}");
 	}
 
 	return;
     }
 
-    $userHandle = &verifyUser($who, $nuh);
     &status("$b_red=$b_cyan$who$b_red=$ob $message");
+
     if ($message =~ s/^\.//) {	# dcc chat commands.
 	### TODO: make use of &Forker(); here?
-	&loadMyModule($myModules{'ircdcc'});
-	return '$noreply from userD' if (&userDCC() eq $noreply);
+	&loadMyModule( $myModules{'ircdcc'} );
+
+	&DCCBroadcast("#$who# $message","m");
+
+	my $retval	= &userDCC();
+	return unless (defined $retval);
+	return if ($retval eq $noreply);
+
 	$conn->privmsg($dcc{'CHAT'}{$who}, "Invalid command.");
 
     } else {			# dcc chat arena.
-	foreach (keys %{$dcc{'CHAT'}}) {
+
+	foreach (keys %{ $dcc{'CHAT'} }) {
 	    $conn->privmsg($dcc{'CHAT'}{$_}, "<$who> $orig{message}");
 	}
     }
@@ -111,7 +136,28 @@ sub on_chat {
 sub on_endofmotd {
     my ($self) = @_;
 
-    if (&IsParam("wingate")) {
+    # update IRCStats.
+    $ident	||= $param{'ircNick'};	# hack.
+    $ircstats{'ConnectTime'}	= time();
+    $ircstats{'ConnectCount'}++;
+    $ircstats{'OffTime'}	+= time() - $ircstats{'DisconnectTime'}
+			if (defined $ircstats{'DisconnectTime'});
+
+    # first time run.
+    if (!exists $users{_default}) {
+	&status("!!! First time run... adding _default user.");
+	$users{_default}{FLAGS}	= "mrt";
+	$users{_default}{HOSTS}{"*!*@*"} = 1;
+    }
+
+    if (scalar keys %users < 2) {
+	&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")) {
 	my $file = "$bot_base_dir/$param{'ircUser'}.wingate";
 	open(IN, $file);
 	while (<IN>) {
@@ -123,32 +169,59 @@ sub on_endofmotd {
     }
 
     if ($firsttime) {
-	&DEBUG("on_EOM: calling sS in 60s.");
-	$conn->schedule(60, \&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 = split /[\t\s]+/, $param{'join_channels'};
+	&WARN("joinchan array is empty!");
+	@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");
+#    &DEBUG("adding self to NOTIFY list.");
+
     &joinNextChan();
 }
 
+sub on_endofwho {
+    my ($self, $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) = @_;
     my $type = uc( ($event->args)[1] );
-    my $nick = $event->nick();
+    my $nick = lc $event->nick();
 
     # pity Net::IRC doesn't store nuh. Here's a hack :)
-    $self->whois($nick);
+    if (!exists $nuh{lc $nick}) {
+	$self->whois($nick);
+	$nuh{$nick}	= "GETTING-NOW";	# trying.
+    }
+    $type ||= "???";
 
     if ($type eq 'SEND') {	# GET for us.
 	# incoming DCC SEND. we're receiving a file.
@@ -163,13 +236,15 @@ sub on_dcc {
 		\*DCCGET
 	);
     } elsif ($type eq 'GET') {	# SEND for us?
-	&DEBUG("starting get.");
+	&status("DCC: Initializing SEND for $nick.");
 	$self->new_send($event->args);
+
     } elsif ($type eq 'CHAT') {
-	&DEBUG("starting chat.");
+	&status("DCC: Initializing CHAT for $nick.");
 	$self->new_chat($event);
+
     } else {
-	&status("${b_green}DCC $type$ob unknown ...");
+	&WARN("${b_green}DCC $type$ob (1)");
     }
 }
 
@@ -179,9 +254,10 @@ sub on_dcc_close {
     my $sock = ($event->to)[0];
 
     # DCC CHAT close on fork exit workaround.
-    return if ($bot_pid != $$);
-
-    &DEBUG("dcc_close: nick => '$nick'.");
+    if ($bot_pid != $$) {
+	&WARN("run-away fork; exiting.");
+	&delForked($forker);
+    }
 
     if (exists $dcc{'SEND'}{$nick} and -f "$param{tempDir}/$nick.txt") {
 	&status("${b_green}DCC SEND$ob close from $b_cyan$nick$ob");
@@ -193,36 +269,82 @@ sub on_dcc_close {
     } elsif (exists $dcc{'CHAT'}{$nick} and $dcc{'CHAT'}{$nick} eq $sock) {
 	&status("${b_green}DCC CHAT$ob close from $b_cyan$nick$ob");
 	delete $dcc{'CHAT'}{$nick};
+	delete $dcc{'CHATvrfy'}{$nick};
     } else {
-	&status("${b_green}DCC$ob UNKNOWN close from $b_cyan$nick$ob");
+	&status("${b_green}DCC$ob UNKNOWN close from $b_cyan$nick$ob (2)");
     }
 }
 
 sub on_dcc_open {
     my ($self, $event) = @_;
     my $type = uc( ($event->args)[0] );
-    my $nick = $event->nick();
+    my $nick = lc $event->nick();
     my $sock = ($event->to)[0];
+
     $msgType = 'chat';
+    $type ||= "???";
+    ### BUG: who is set to bot's nick?
 
+    # lets do it.
     if ($type eq 'SEND') {
 	&status("${b_green}DCC lGET$ob established with $b_cyan$nick$ob");
+
     } elsif ($type eq 'CHAT') {
-	&status("${b_green}DCC CHAT$ob established with $b_cyan$nick$ob ($nuh{$nick})");
-	$userHandle     = &verifyUser($nick, $nuh{lc $nick});
-	my $crypto	= $userList{$userHandle}{'pass'};
-	if (defined $crypto) {
-	    $self->privmsg($sock,"Enter Password, $userHandle.");
+	# very cheap hack.
+	### TODO: run ScheduleThis inside on_dcc_open_chat recursively
+	###	1,3,5,10 seconds then fail.
+	if ($nuh{$nick} eq "GETTING-NOW") {
+	    &ScheduleThis(3/60, "on_dcc_open_chat", $nick, $sock);
 	} else {
-	    $self->privmsg($sock,"Welcome to blootbot DCC CHAT interface, $userHandle.");
+	    on_dcc_open_chat(undef, $nick, $sock);
 	}
+
     } elsif ($type eq 'SEND') {
 	&DEBUG("Starting DCC receive.");
 	foreach ($event->args) {
 	    &DEBUG("  => '$_'.");
 	}
+
+    } else {
+	&WARN("${b_green}DCC $type$ob (3)");
+    }
+}
+
+# really custom sub to get NUH since Net::IRC doesn't appear to support
+# it.
+sub on_dcc_open_chat {
+    my(undef, $nick, $sock) = @_;
+
+    if ($nuh{$nick} eq "GETTING-NOW") {
+	&DEBUG("getting nuh for $nick failed. FIXME.");
+	return;
+    }
+
+    &status("${b_green}DCC CHAT$ob established with $b_cyan$nick$ob $b_yellow($ob$nuh{$nick}$b_yellow)$ob");
+
+    &verifyUser($nick, $nuh{lc $nick});
+
+    if (!exists $users{$userHandle}{HOSTS}) {
+	&pSReply("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 {
-	&status("${b_green}DCC $type$ob unknown ...");
+#	&dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
     }
 }
 
@@ -235,14 +357,28 @@ sub on_disconnect {
     $ircstats{'DisconnectTime'}		= time();
     $ircstats{'DisconnectReason'}	= $what;
     $ircstats{'DisconnectCount'}++;
+    $ircstats{'TotalTime'}	+= time() - $ircstats{'ConnectTime'}
+					if ($ircstats{'ConnectTime'});
 
     # 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");
+	&DEBUG("running function irc... lets hope this works.");
+	&irc();
+	return;
+    }
+
     if (!$self->connect()) {
-	&WARN("not connected? help me. gonna call ircCheck() in 1800s");
-	$conn->schedule(1800, \&ircCheck(), "");
+	&DEBUG("on_disconnect: 3");
+	&WARN("not connected? help me. gonna call ircCheck() in 60s");
+	&clearIRCVars();
+	&ScheduleThis(1, "ircCheck");
     }
 }
 
@@ -250,19 +386,23 @@ sub on_endofnames {
     my ($self, $event) = @_;
     my $chan = ($event->args)[1];
 
-    if (exists $jointime{$chan}) {
-	my $delta_time = sprintf("%.03f", &gettimeofday() - $jointime{$chan});
-	$delta_time    = 0	if ($delta_time < 0);
+    # sync time should be done in on_endofwho like in BitchX
+    if (exists $cache{jointime}{$chan}) {
+	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");
+    &rawout("MODE $chan");
 
     my $txt;
     my @array;
     foreach ("o","v","") {
-	my $count = scalar(keys %{$channels{$chan}{$_}});
+	my $count = scalar(keys %{ $channels{$chan}{$_} });
 	next unless ($count);
 
 	$txt = "total" if ($_ eq "");
@@ -274,29 +414,9 @@ sub on_endofnames {
     my $chanstats = join(' || ', @array);
     &status("$b_blue$chan$ob: [$chanstats]");
 
-    if (scalar @joinchan) {	# remaining channels to join.
-	&joinNextChan();
-    } else {
-	### chanserv support.
-	### TODO: what if we rejoin a channel.. need to set a var that
-	###	  we've done the request-for-ops-on-join.
-	return unless (&IsParam("chanServ_ops"));
-	return unless ($nickserv);
-
-	my @chans = split(/[\s\t]+/, $param{'chanServ_ops'});
-
-	### TODO: since this function has a chan arg, why don't we use
-	###	  that instead of doing the following?
-	foreach $chan (keys %channels) {
-	    next unless (grep /^$chan$/i, @chans);
-
-	    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 {
@@ -309,43 +429,64 @@ sub on_init {
 
 sub on_invite {
     my ($self, $event) = @_;
-    my $chan = ($event->args)[0];
+    my $chan = lc( ($event->args)[0] );
     my $nick = $event->nick;
 
-    &DEBUG("on_invite: chan => '$chan', nick => '$nick'.");
-
-    # chan + possible_key.
-    ### do we need to know the key if we're invited???
-    ### grep the channel list?
-    foreach (split /[\s\t]+/, $param{'join_channels'}) {
-	next unless /^\Q$chan\E(,\S+)?$/i;
-	s/,/ /;
+    if ($nick =~ /^\Q$ident\E$/) {
+	&DEBUG("on_invite: self invite.");
+	return;
+    }
 
-	next if ($nick =~ /^\Q$ident\E$/);
+    ### 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();
+    my ($self, $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;
 
     $chanstats{$chan}{'Join'}++;
-    $userstats{lc $who}{'Join'} = time() if (&IsParam("seenStats"));
+    $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats"));
+    $cache{maxpeeps}{$chan}	= $i if ($i > $j);
+
+    &joinfloodCheck($who, $chan, $event->userhost);
 
     # netjoin detection.
     my $netsplit = 0;
     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 !exists $cache{netsplit}) {
+	&VERB("on_join: ok.... re-running chanlimitCheck in 60.",2);
+	$conn->schedule(60, sub {
+		&chanlimitCheck();
+		delete $cache{netsplit};
+	} );
+
+	$cache{netsplit} = time();
     }
 
     # how to tell if there's a netjoin???
@@ -355,29 +496,81 @@ sub on_join {
     &status(">>> join/$b_blue$chan$ob $b_cyan$who$ob $b_yellow($ob$user\@$host$b_yellow)$ob$netsplitstr");
 
     $channels{$chan}{''}{$who}++;
-    $nuh{lc $who} = $who."!".$user."\@".$host unless (exists $nuh{lc $who});
+    $nuh	  = $who."!".$user."\@".$host;
+    $nuh{lc $who} = $nuh unless (exists $nuh{lc $who});
+
+    ### on-join bans.
+    my @bans;
+    push(@bans, keys %{ $bans{$chan} }) if (exists $bans{$chan});
+    push(@bans, keys %{ $bans{"*"} })   if (exists $bans{"*"});
+
+    foreach (@bans) {
+	my $ban	= $_;
+	s/\?/./g;
+	s/\*/\\S*/g;
+	my $mask	= $_;
+	next unless ($nuh =~ /^$mask$/i);
+
+	### TODO: check $channels{$chan}{'b'} if ban already exists.
+	foreach (keys %{ $channels{$chan}{'b'} }) {
+	    &DEBUG(" bans_on_chan($chan) => $_");
+	}
 
-    ### ROOTWARN:
-    &rootWarn($who,$user,$host,$chan)
-		if (&IsParam("rootWarn") &&
-		    $user =~ /^r(oo|ew|00)t$/i &&
-		    $channels{$chan}{'o'}{$ident});
-
-    # used to determine sync time.
-    if ($who =~ /^$ident$/i) {
-	if (defined( my $whojoin = $joinverb{$chan} )) {
+	my $reason = "no reason";
+	foreach ($chan, "*") {
+	    next unless (exists $bans{$_});
+	    next unless (exists $bans{$_}{$ban});
+
+	    my @array	= @{ $bans{$_}{$ban} };
+
+	    $reason	= $array[4] if ($array[4]);
+	    last;
+	}
+
+	&ban($ban, $chan);
+	&kick($who, $chan, $reason);
+
+	last;
+    }
+
+    # no need to go further.
+    return if ($netsplit);
+
+    # who == bot.
+    if ($who eq $ident or $who =~ /^$ident$/i) {
+	if (defined( my $whojoin = $cache{join}{$chan} )) {
 	    &msg($chan, "Okay, I'm here. (courtesy of $whojoin)");
-	    delete $joinverb{$chan};
+	    delete $cache{join}{$chan};
+	    &joinNextChan();	# hack.
 	}
 
 	### TODO: move this to &joinchan()?
-	$jointime{$chan} = &gettimeofday();
+	$cache{jointime}{$chan} = &timeget();
 	rawout("WHO $chan");
-    } else {
-	### TODO: this may go wild on a netjoin :)
-	### WINGATE:
-	&wingateCheck();
+
+	return;
     }
+
+    ### ROOTWARN:
+    &rootWarn($who,$user,$host,$chan) if (
+		&IsChanConf("rootWarn") &&
+		$user =~ /^r(oo|ew|00)t$/i
+    );
+
+    ### 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);
+
+    ### wingate:
+    &wingateCheck();
 }
 
 sub on_kick {
@@ -389,6 +582,7 @@ sub on_kick {
 
     &status(">>> kick/$b_blue$chan$ob [$b$kickee!$uh$ob] by $b_cyan$kicker$ob $b_yellow($ob$reason$b_yellow)$ob");
 
+    $chan = lc $chan;	# forgot about this, found by xsdg, 20001229.
     $chanstats{$chan}{'Kick'}++;
 
     if ($kickee eq $ident) {
@@ -397,16 +591,16 @@ 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)	= @_;
     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$//;
 
@@ -414,29 +608,42 @@ sub on_mode {
 	&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();
+    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) = @_;
     my $nick = $event->nick;
-    my $chan = lc ( ($event->to)[0] );	# CASING.
-    my $msg = ($event->args)[0];
+    my $msg  = ($event->args)[0];
 
     ($user,$host) = split(/\@/, $event->userhost);
     $uh		= $event->userhost();
     $nuh	= $nick."!".$uh;
+    $msgtime	= time();
+    $h		= $host;
+
+    if ($nick eq $ident) { # hopefully ourselves.
+	if ($msg eq "TEST") {
+	    &status("IRCTEST: Yes, we're alive.");
+	    delete $cache{connect};
+	    return;
+	}
+    }
 
-    &hookMsg('private', $chan, $nick, $msg);
+    &hookMsg('private', undef, $nick, $msg);
+    $who	= "";
+    $chan	= "";
+    $msgType	= "";
 }
 
 sub on_names {
@@ -459,37 +666,47 @@ sub on_nick {
     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) {
 	&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);
-    &getNickInUse(1);
+    $self->whois($nick);
+    $conn->schedule(5, sub {
+	&status("nick taken; changing to temporary nick ($nick -> $newnick).");
+	&nick($newnick);
+    } );
 }
 
 sub on_notice {
@@ -501,8 +718,13 @@ sub on_notice {
     if ($nick =~ /^NickServ$/i) {		# nickserv.
 	&status("NickServ: <== '$args'");
 
-	if ($args =~ /^This nickname is registered/i) {
+	my $check	= 0;
+	$check++	if ($args =~ /^This nickname is registered/i);
+	$check++	if ($args =~ /nickname.*owned/i);
+
+	if ($check) {
 	    &status("nickserv told us to register; doing it.");
+
 	    if (&IsParam("nickServ_pass")) {
 		&status("NickServ: ==> Identifying.");
 		&rawout("PRIVMSG NickServ :IDENTIFY $param{'nickServ_pass'}");
@@ -514,10 +736,20 @@ 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");
@@ -539,14 +771,29 @@ sub on_other {
 
 sub on_part {
     my ($self, $event) = @_;
-    my $chan = lc( ($event->to)[0] );	# CASING!!!
-    my $nick = $event->nick;
+    $chan	= lc( ($event->to)[0] );	# CASING!!!
+    my $nick	= $event->nick;
     my $userhost = $event->userhost;
+    $who	= $nick;
+    $msgType	= "public";
+
+    if (0 and !exists $channels{$chan}) {
+	&DEBUG("on_part: found out we're 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 &IsParam("seenStats")) {
+    &delUserInfo($nick,$chan);
+    if ($nick eq $ident) {
+	&DEBUG("on_part: ok, I left $chan... clearChanVars...");
+	&clearChanVars($chan);
+    }
+
+    if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) {
 	delete $userstats{lc $nick};
     }
 
@@ -563,91 +810,158 @@ 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.");
 }
 
 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;
+    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;
 
-    if ($$ != $bot_pid) {
-	&ERROR("SHOULD NEVER HAPPEN.");
-	exit(0);
-    }
-
-    ### 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}{$_} ...");
-		}
-	    }
-	}
+    # rare case should this happen - catch it just in case.
+    if ($bot_pid != $$) {
+	&ERROR("run-away fork; exiting.");
+	&delForked($forker);
     }
 
-
-    $msgtime = time();
-    $lastWho{$chan} = $nick;
+    $msgtime		= time();
+    $lastWho{$chan}	= $nick;
     ### TODO: use $nick or lc $nick?
-    if (&IsParam("seenStats")) {
+    if (&IsChanConf("seenStats")) {
 	$userstats{lc $nick}{'Count'}++;
 	$userstats{lc $nick}{'Time'} = time();
     }
 
-#    if (&IsParam("hehCounter")) {
-#	#...
-#    }
+    # would this slow things down?
+    if ($_ = &getChanConf("ircTextCounters")) {
+	my $time = time();
+
+	foreach (split /[\s]+/) {
+	    my $x = $_;
+
+	    # either full word or ends with a space, etc...
+	    next unless ($msg =~ /^\Q$x\E[\$\s!.]/i);
+
+	    &VERB("textcounters: $x matched for $who",2);
+	    my $c = $chan || "PRIVATE";
+
+	    my ($v,$t) = &dbGet("stats", "counter,time",
+			"nick=". &dbQuote($who)
+			." AND type=".&dbQuote($x)
+			." AND channel=".&dbQuote($c)
+	    );
+	    $v++;
+
+	    # don't allow ppl to cheat the stats :-)
+	    next unless ($time - $t > 10);
+
+	    my %hash = (
+		nick	=> $who,
+		type	=> $x,
+		channel => $c,
+
+		time	=> $time,
+		counter => $v,
+	    );
+		
+
+	    &dbReplace("stats", "nick", %hash);
+	    # does not work, atleast with old mysql!!! :(
+#	    &dbReplace("stats", (nick => $who, type => $x, -counter => "counter+1") );
+	}
+    }
 
     &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];
+    my $nick	= $event->nick();
+    my $reason	= ($event->args)[0];
+
+    # hack for ICC.
+    $msgType	= "public";
+    $who	= $nick;
+###    $chan	= $reason;	# no.
 
-    foreach (keys %channels) {
+    my $count	= 0;
+    foreach (grep !/^_default$/, keys %channels) {
 	# fixes inconsistent chanstats bug #1.
-	next unless (&IsNickInChan($nick,$_));
+	if (!&IsNickInChan($nick,$_)) {
+	    $count++;
+	    next;
+	}
 	$chanstats{$_}{'SignOff'}++;
     }
-    &DeleteUserInfo($nick, keys %channels);
-    if (exists $nuh{lc $nick}) {
-	delete $nuh{lc $nick};
-    } else {
-	&DEBUG("on_quit: nuh{lc $nick} does not exist! FIXME");
+
+    if ($count == scalar keys %channels) {
+	&DEBUG("on_quit: nick $nick was not found in any chan.");
     }
-    delete $userstats{lc $nick} if (&IsParam("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";
 
+	# chanlimit code.
+	foreach $chan ( &getNickInChans($nick) ) {
+	    next unless ( &IsChanConf("chanlimitcheck") );
+	    next unless ( exists $channels{$_}{'l'} );
+
+	    &DEBUG("on_quit: netsplit detected on $_; disabling chan limit.");
+	    &rawout("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(localtime)."]");
 	    $netsplitservers{$1}{$2} = time();
 	}
     }
 
-    &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. FIXME HOPEFULLY");
+	&ERROR("^^^ THIS SHOULD NEVER HAPPEN (10).");
     }
+
+    ###
+    ### 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"));
+    delete $chanstats{lc $nick};
+    ###
+
+    # does this work?
     if ($nick !~ /^\Q$ident\E$/ and $nick =~ /^\Q$param{'ircNick'}\E$/i) {
-	&status("own nickname became free; changing.");
+	&status("nickchange: own nickname became free; changing.");
 	&nick($param{'ircNick'});
     }
 }
@@ -655,23 +969,33 @@ sub on_quit {
 sub on_targettoofast {
     my ($self, $event) = @_;
     my $nick = $event->nick();
-    my $chan = ($event->to)[0];
+    my($me,$chan,$why) = $event->args();
 
-    &DEBUG("on_targettoofast: nick => '$nick'.");
-    &DEBUG("on_targettoofast: chan => '$chan'.");
+    ### TODO: incomplete.
+    if ($why =~ /.* wait (\d+) second/) {
+	my $sleep	= $1;
+	my $max		= 10;
 
-    foreach ($event->args) {
-	&DEBUG("on_targettoofast: args => '$_'.");
-    }
+	if ($sleep > $max) {
+	    &status("targettoofast: going to sleep for $max ($sleep)...");
+	    $sleep = $max;
+	} else {
+	    &status("targettoofast: going to sleep for $sleep");
+	}
 
-###    .* wait (\d+) second/) {
-	&status("X1 $msg");
-	my $sleep = $3 + 10;
+	my $delta = time() - ($cache{sleepTime} || 0);
+	if ($delta > $max+2) {
+	    sleep $sleep;
+	    $cache{sleepTime} = time();
+	}
 
-	&status("going to sleep for $sleep...");
-	sleep $sleep;
-	&joinNextChan();
-### }
+	return;
+    }
+
+    if (!exists $cache{TargetTooFast}) {
+	&DEBUG("on_ttf: failed: $why");
+	$cache{TargetTooFast}++;
+    }
 }
 
 sub on_topic {
@@ -691,13 +1015,13 @@ sub on_topic {
 	#	this may be fixed at a later date with topic queueing.
 	###
 
-	$topic{$chan}{'Current'} = $topic if (1 and &IsParam("topic") == 1);
+	$topic{$chan}{'Current'} = $topic if (1);
 	$chanstats{$chan}{'Topic'}++;
 
 	&status(">>> topic/$b_blue$chan$ob by $b_cyan$nick$ob -> $topic");
     } else {						# join.
 	my ($nick, $chan, $topic) = $event->args;
-	if (&IsParam("topic")) {
+	if (&IsChanConf("topic")) {
 	    $topic{$chan}{'Current'}	= $topic;
 	    &topicAddHistory($chan,$topic);
 	}
@@ -721,248 +1045,168 @@ sub on_topicinfo {
     &status(">>> set by $b_cyan$setby$ob $timestr");
 }
 
-sub on_version {
+sub on_crversion {
     my ($self, $event) = @_;
-    my $nick = $event->nick;
+    my $nick	= $event->nick();
+    my $ver;
+
+    if (scalar $event->args() != 1) {	# old.
+	$ver	= join ' ', $event->args();
+	$ver	=~ s/^VERSION //;
+    } else {				# new.
+	$ver	= ($event->args())[0];
+    }
 
-    &status(">>> ${b_green}CTCP VERSION$ob request from $b_cyan$nick$ob");
-    $self->ctcp_reply($nick, "VERSION $bot_version");
-}
+    if (grep /^\Q$nick\E$/i, @vernick) {
+	&WARN("nick $nick found in vernick ($ver); skipping.");
+	return;
+    }
+    push(@vernick, $nick);
 
-sub on_who {
-    my ($self, $event) = @_;
-    my @args	= $event->args;
+    if ($ver =~ /bitchx/i) {
+	$ver{bitchx}{$nick}	= $ver;
 
-    $nuh{lc $args[5]} = $args[5]."!".$args[2]."\@".$args[3];
-}
+    } elsif ($ver =~ /xc\!|xchat/i) {
+	$ver{xchat}{$nick}	= $ver;
 
-sub on_whoisuser {
-    my ($self, $event) = @_;
-    my @args	= $event->args;
+    } elsif ($ver =~ /irssi/i) {
+	$ver{irssi}{$nick}	= $ver;
 
-    $nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3];
-}
+    } elsif ($ver =~ /epic|(Third Eye)/i) {
+	$ver{epic}{$nick}	= $ver;
 
-#######################################################################
-####### IRC HOOK HELPERS   IRC HOOK HELPERS   IRC HOOK HELPERS ########
-#######################################################################
+    } elsif ($ver =~ /ircII|PhoEniX/i) {
+	$ver{ircII}{$nick}	= $ver;
 
-#####
-# Usage: &hookMode($chan, $modes, @targets);
-sub hookMode {
-    my ($chan, $modes, @targets) = @_;
-    my $parity	= 0;
+    } elsif ($ver =~ /mirc/i) {
+#	&DEBUG("verstats: mirc: $nick => '$ver'.");
+	$ver{mirc}{$nick}	= $ver;
 
-    $chan = lc $chan;		# !!!.
+# ok... then we get to the lesser known/used clients.
+    } elsif ($ver =~ /ircle/i) {
+	$ver{ircle}{$nick}	= $ver;
 
-    my $mode;
-    foreach $mode (split(//, $modes)) {
-	# sign.
-	if ($mode =~ /[-+]/) {
-	    $parity = 1		if ($mode eq "+");
-	    $parity = 0		if ($mode eq "-");
-	    next;
-	}
+    } elsif ($ver =~ /chatzilla/i) {
+	$ver{chatzilla}{$nick}	= $ver;
 
-	# mode with target.
-	if ($mode =~ /[bklov]/) {
-	    my $target = shift @targets;
+    } elsif ($ver =~ /pirch/i) {
+	$ver{pirch}{$nick}	= $ver;
 
-	    if ($parity) {
-		$chanstats{$chan}{'Op'}++    if ($mode eq "o");
-		$chanstats{$chan}{'Ban'}++   if ($mode eq "b");
-	    } else {
-		$chanstats{$chan}{'Deop'}++  if ($mode eq "o");
-		$chanstats{$chan}{'Unban'}++ if ($mode eq "b");
-	    }
+    } elsif ($ver =~ /sirc /i) {
+	$ver{sirc}{$nick}	= $ver;
 
-	    # modes w/ target affecting nick => cache it.
-	    if ($mode =~ /[ov]/) {
-		$channels{$chan}{$mode}{$target}++	if  $parity;
-		delete $channels{$chan}{$mode}{$target}	if !$parity;
-	    }
+    } elsif ($ver =~ /kvirc/i) {
+	$ver{kvirc}{$nick}	= $ver;
 
-	    if ($mode =~ /[l]/) {
-		$channels{$chan}{$mode} = $target	if  $parity;
-		delete $channels{$chan}{$mode}		if !$parity;
-	    }
-	}
+    } elsif ($ver =~ /eggdrop/i) {
+	$ver{eggdrop}{$nick}	= $ver;
 
-	# important channel modes, targetless.
-	if ($mode =~ /[mt]/) {
-	    $channels{$chan}{$mode}++			if  $parity;
-	    delete $channels{$chan}{$mode}		if !$parity;
-	}
+    } elsif ($ver =~ /xircon/i) {
+	$ver{xircon}{$nick}	= $ver;
+
+    } else {
+	&DEBUG("verstats: other: $nick => '$ver'.");
+	$ver{other}{$nick}	= $ver;
     }
 }
 
-sub hookMsg {
-    ($msgType, $chan, $who, $message) = @_;
-    my $skipmessage	= 0;
-    $addressed		= 0;
-    $addressedother	= 0;
-    $orig{message}	= $message;
-    $orig{who}		= $who;
-    $addrchar		= 0;
-
-    $message	=~ s/[\cA-\c_]//ig;	# strip control characters
-    $message	=~ s/^\s+//;		# initial whitespaces.
-    $who	=~ tr/A-Z/a-z/;		# lowercase.
+sub on_version {
+    my ($self, $event) = @_;
+    my $nick = $event->nick;
 
-    &showProc();
+    &status(">>> ${b_green}CTCP VERSION$ob request from $b_cyan$nick$ob");
+    $self->ctcp_reply($nick, "VERSION $bot_version");
+}
 
-    # addressing.
-    if ($msgType =~ /private/) {
-	# private messages.
-	$addressed = 1;
-    } else {
-	# public messages.
-	# addressing revamped by the xk.
-	### below needs to be fixed...
-	if (&IsParam("addressCharacter")) {
-	    if ($message =~ s/^$param{'addressCharacter'}//) {
-		$addrchar  = 1;
-		$addressed = 1;
-	    }
-	}
+sub on_who {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
+    my $str	= $args[5]."!".$args[2]."\@".$args[3];
 
-	if ($message =~ /^($mask{nick})([\;\:\>\, ]+) */) {
-	    my $newmessage = $';
-	    if ($1 =~ /^\Q$ident\E$/i) {
-		$message   = $newmessage;
-		$addressed = 1;
-	    } else {
-		# ignore messages addressed to other people or unaddressed.
-		$skipmessage++ if ($2 ne "" and $2 !~ /^ /);
-	    }
-	}
+    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;
     }
 
-    # Determine floodwho.
-    if ($msgType =~ /public/i) {		# public.
-	$floodwho = lc $chan;
-    } elsif ($msgType =~ /private/i) {	# private.
-	$floodwho = lc $who;
-    } else {				# dcc?
-	&DEBUG("FIXME: floodwho = ???");
+    if ($args[5] =~ /^nickserv$/i and !$nickserv) {
+	&DEBUG("ok... we did a who for nickserv.");
+	&rawout("PRIVMSG NickServ :IDENTIFY $param{'nickServ_pass'}");
     }
 
-    my ($count, $interval) = split(/:/, $param{'floodRepeat'} || "2:10");
+    $nuh{lc $args[5]} = $args[5]."!".$args[2]."\@".$args[3];
+}
 
-    # flood repeat protection.
-    if ($addressed) {
-	my $time = $flood{$floodwho}{$message};
+sub on_whois {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
 
-	if (defined $time and (time - $time < $interval)) {
-	    ### public != personal who so the below is kind of pointless.
-	    my @who;
-	    foreach (keys %flood) {
-		next if (/^\Q$floodwho\E$/ or /^\Q$chan\E$/);
-		push(@who, grep /^\Q$message\E$/i, keys %{$flood{$_}});
-	    }
-	    if (scalar @who) {
-		&msg($who, "you already said what ".
-				join(' ', @who)." have said.");
-	    } else {
-		&msg($who,"Someone already said that ". (time - $time) ." seconds ago" );
-	    }
+    $nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3];
+}
 
-	    ### TODO: delete old floodwarn{} keys.
-	    my $floodwarn = 0;
-	    if (!exists $floodwarn{$floodwho}) {
-		$floodwarn++;
-	    } else {
-		$floodwarn++ if (time() - $floodwarn{$floodwho} > $interval);
-	    }
+sub on_whoischannels {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
 
-	    if ($floodwarn) {
-		&status("FLOOD repetition detected from $floodwho.");
-		$floodwarn{$floodwho} = time();
-	    }
+    &DEBUG("on_whoischannels: @args");
+}
 
-	    return;
-	}
+sub on_useronchannel {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
 
-	if ($addrchar) {
-	    &status("$b_cyan$who$ob is short-addressing me");
-	} else {
-	    &status("$b_cyan$who$ob is addressing me");
-	}
+    &DEBUG("on_useronchannel: @args");
+    &joinNextChan();
+}
 
-	$flood{$floodwho}{$message} = time();
-    }
+###
+### since joinnextchan is hooked onto on_endofnames, these are needed.
+###
 
-    ($count, $interval) = split(/:/, $param{'floodMessages'} || "5:30");
-    # flood overflow protection.
-    if ($addressed) {
-	foreach (keys %{$flood{$floodwho}}) {
-	    next unless (time() - $flood{$floodwho}{$_} > $interval);
-	    delete $flood{$floodwho}{$_};
-	}
+sub on_chanfull {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
 
-	my $i = scalar keys %{$flood{$floodwho}};
-	if ($i > $count) {
-	    &msg($who,"overflow of messages ($i > $count)");
-	    &status("FLOOD overflow detected from $floodwho; ignoring");
+    &status(">>> chanfull/$b_blue$args[1]$ob");
 
-	    my $expire = $param{'ignoreAutoExpire'} || 5;
-	    $ignoreList{"*!$uh"} = time() + ($expire * 60);
-	    return;
-	}
+    &joinNextChan();
+}
 
-	$flood{$floodwho}{$message} = time();
-    }
+sub on_inviteonly {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
 
-    # public.
-    if ($msgType =~ /public/i) {
-	$talkchannel = $chan;
-	&status("<$orig{who}/$chan> $orig{message}");
-    }
+    &status(">>> inviteonly/$b_cyan$args[1]$ob");
 
-    # private.
-    if ($msgType =~ /private/i) {
-	&status("[$orig{who}] $orig{message}");
-    }
+    &joinNextChan();
+}
 
-    if ((!$skipmessage or &IsParam("seenStoreAll")) and
-	&IsParam("seen") and
-	$msgType =~ /public/
-    ) {
-	$seencache{$who}{'time'} = time();
-	$seencache{$who}{'nick'} = $orig{who};
-	$seencache{$who}{'host'} = $uh;
-	$seencache{$who}{'chan'} = $talkchannel;
-	$seencache{$who}{'msg'}  = $orig{message};
-	$seencache{$who}{'msgcount'}++;
-    }
+sub on_banned {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
+    my $chan	= $args[1];
 
-    return if ($skipmessage);
-    return unless (&IsParam("minVolunteerLength") or $addressed);
+    &status(">>> banned/$b_blue$chan$ob $b_cyan$args[0]$ob");
 
-    local $ignore = 0;
-    foreach (keys %ignoreList) {
-	my $ignoreRE = $_;
-	my @parts = split /\*/, "a${ignoreRE}a";
-	my $recast = join '\S*', map quotemeta($_), @parts;
-	$recast =~ s/^a(.*)a$/$1/;
-	if ($nuh =~ /^$recast$/) {
-	    $ignore++;
-	    last;
-	}
-    }
+    &joinNextChan();
+}
 
-    if (defined $nuh) {
-	$userHandle = &verifyUser($who, $nuh);
-    } else {
-	&DEBUG("hookMsg: 'nuh' not defined?");
-    }
+sub on_badchankey {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
 
-### For extra debugging purposes...
-    if ($_ = &process()) {
-#	&DEBUG("IrcHooks: process returned '$_'.");
-    }
+    &DEBUG("on_badchankey: args => @args");
+    &joinNextChan();
+}
 
-    return;
+sub on_useronchan {
+    my ($self, $event) = @_;
+    my @args	= $event->args;
+
+    &DEBUG("on_useronchan: args => @args");
+    &joinNextChan();
 }
 
 1;