X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FCommandStubs.pl;h=ebfefb84fab6ffbffee73f96c634d3404f4c27e0;hb=5fabbb6f96f8c1a08869475a120d97396cbd0d36;hp=d086c48b9430c1a3b42de1a891cb6367502407cb;hpb=0a03234c837cefef8cd59c3f078e8a1732ae35c9;p=infobot.git

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index d086c48..ebfefb8 100644
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -25,14 +25,14 @@ use vars qw($total $x $type $i $good %wingateToDo);
 ###
 
 sub addCmdHook {
-    my ($ident, %hash) = @_;
+    my ( $ident, %hash ) = @_;
 
-    if (exists $cmdhooks{$ident}) {
-	&WARN("aCH: \$cmdhooks{$ident} already exists.");
-	return;
+    if ( exists $cmdhooks{$ident} ) {
+        &WARN("aCH: \$cmdhooks{$ident} already exists.");
+        return;
     }
 
-    &VERB("aCH: added $ident",2);	# use $hash{'Identifier'}?
+    &VERB( "aCH: added $ident", 2 );    # use $hash{'Identifier'}?
     ### hrm... prevent warnings?
     $cmdhooks{$ident} = \%hash;
 }
@@ -40,113 +40,119 @@ sub addCmdHook {
 # RUN IF ADDRESSED.
 sub parseCmdHook {
     my ($line) = @_;
-    $line =~ s/^\s+|\s+$//g;	# again.
+    $line =~ s/^\s+|\s+$//g;        # again.
     $line =~ /^(\S+)(\s+(.*))?$/;
-    my $cmd	= $1;	# command name is whitespaceless.
-    my $flatarg	= $3;
-    my @args	= split(/\s+/, $flatarg || '');
-    my $done	= 0;
+    my $cmd     = $1;               # command name is whitespaceless.
+    my $flatarg = $3;
+    my @args = split( /\s+/, $flatarg || '' );
+    my $done = 0;
 
     &shmFlush();
 
-    if (!defined %cmdhooks) {
-	&WARN('%cmdhooks does not exist.');
-	return 0;
+    if ( !defined %cmdhooks ) {
+        &WARN('%cmdhooks does not exist.');
+        return 0;
+    }
+
+    if ( !defined $cmd ) {
+        &WARN('cstubs: cmd == NULL.');
+        return 0;
     }
 
-    if (!defined $cmd) {
-	&WARN('cstubs: cmd == NULL.');
-	return 0;
-    }
-
-    foreach (keys %cmdhooks) {
-	# rename to something else! like $id or $label?
-	my $ident = $_;
-
-	next unless ($cmd =~ /^$ident$/i);
+    foreach ( keys %cmdhooks ) {
 
-	if ($done) {
-	    &WARN("pCH: Multiple hook match: $ident");
-	    next;
-	}
+        # rename to something else! like $id or $label?
+        my $ident = $_;
 
-	&status("cmdhooks: $cmd matched '$ident' '$flatarg'");
-	my %hash = %{ $cmdhooks{$ident} };
+        next unless ( $cmd =~ /^$ident$/i );
 
-	if (!scalar keys %hash) {
-	    &WARN('CmdHook: hash is NULL?');
-	    return 1;
-	}
+        if ($done) {
+            &WARN("pCH: Multiple hook match: $ident");
+            next;
+        }
 
-	if ($hash{NoArgs} and $flatarg) {
-	    &DEBUG("cmd $ident does not take args ('$flatarg'); skipping.");
-	    next;
-	}
+        &status("cmdhooks: $cmd matched '$ident' '$flatarg'");
+        my %hash = %{ $cmdhooks{$ident} };
 
-	if (!exists $hash{CODEREF}) {
-	    &ERROR("CODEREF undefined for $cmd or $ident.");
-	    return 1;
-	}
+        if ( !scalar keys %hash ) {
+            &WARN('CmdHook: hash is NULL?');
+            return 1;
+        }
 
-	### DEBUG.
-	foreach (keys %hash) {
-	    &VERB(" $cmd->$_ => '$hash{$_}'.",2);
-	}
+        if ( $hash{NoArgs} and $flatarg ) {
+            &DEBUG("cmd $ident does not take args ('$flatarg'); skipping.");
+            next;
+        }
 
-	### HELP.
-	if (exists $hash{'Help'} and !scalar(@args)) {
-	    &help( $hash{'Help'} );
-	    return 1;
-	}
+        if ( !exists $hash{CODEREF} ) {
+            &ERROR("CODEREF undefined for $cmd or $ident.");
+            return 1;
+        }
 
-	### IDENTIFIER.
-	if (exists $hash{'Identifier'}) {
-	    return 1 unless (&IsChanConfOrWarn($hash{'Identifier'}));
-	}
+        ### DEBUG.
+        foreach ( keys %hash ) {
+            &VERB( " $cmd->$_ => '$hash{$_}'.", 2 );
+        }
 
-	### USER FLAGS.
-	if (exists $hash{'UserFlag'}) {
-	    return 1 unless (&hasFlag($hash{'UserFlag'}));
-	}
+        ### HELP.
+        if ( exists $hash{'Help'} and !scalar(@args) ) {
+            &help( $hash{'Help'} );
+            return 1;
+        }
 
-	### FORKER,IDENTIFIER,CODEREF.
-	if (($$ == $bot_pid) && exists $hash{'Forker'}) {
-	    if (exists $hash{'ArrayArgs'}) {
-		&Forker($hash{'Identifier'}, sub { \&{ $hash{'CODEREF'} }(@args) } );
-	    } else {
-		&Forker($hash{'Identifier'}, sub { \&{ $hash{'CODEREF'} }($flatarg) } );
-	    }
+        ### IDENTIFIER.
+        if ( exists $hash{'Identifier'} ) {
+            return 1 unless ( &IsChanConfOrWarn( $hash{'Identifier'} ) );
+        }
 
-	} else {
-	    if (exists $hash{'Module'}) {
-		&loadMyModule($hash{'Module'});
-	    }
+        ### USER FLAGS.
+        if ( exists $hash{'UserFlag'} ) {
+            return 1 unless ( &hasFlag( $hash{'UserFlag'} ) );
+        }
 
-	    # check if CODEREF exists.
-	    if (!defined &{ $hash{'CODEREF'} }) {
-		&WARN("coderef $hash{'CODEREF'} does not exist.");
-		if (defined $who) {
-		    &msg($who, "coderef does not exist for $ident.");
-		}
+        ### FORKER,IDENTIFIER,CODEREF.
+        if ( ( $$ == $bot_pid ) && exists $hash{'Forker'} ) {
+            if ( exists $hash{'ArrayArgs'} ) {
+                &Forker( $hash{'Identifier'},
+                    sub { \&{ $hash{'CODEREF'} }(@args) } );
+            }
+            else {
+                &Forker( $hash{'Identifier'},
+                    sub { \&{ $hash{'CODEREF'} }($flatarg) } );
+            }
 
-		return 1;
-	    }
+        }
+        else {
+            if ( exists $hash{'Module'} ) {
+                &loadMyModule( $hash{'Module'} );
+            }
 
-	    if (exists $hash{'ArrayArgs'}) {
-		&{ $hash{'CODEREF'} }(@args);
-	    } else {
-		&{ $hash{'CODEREF'} }($flatarg);
-	    }
-	}
+            # check if CODEREF exists.
+            if ( !defined &{ $hash{'CODEREF'} } ) {
+                &WARN("coderef $hash{'CODEREF'} does not exist.");
+                if ( defined $who ) {
+                    &msg( $who, "coderef does not exist for $ident." );
+                }
 
-	### CMDSTATS.
-	if (exists $hash{'Cmdstats'}) {
-	    $cmdstats{ $hash{'Cmdstats'} }++;
-	}
+                return 1;
+            }
 
-	&VERB('hooks: End of command.',2);
+            if ( exists $hash{'ArrayArgs'} ) {
+                &{ $hash{'CODEREF'} }(@args);
+            }
+            else {
+                &{ $hash{'CODEREF'} }($flatarg);
+            }
+        }
 
-	$done = 1;
+        ### CMDSTATS.
+        if ( exists $hash{'Cmdstats'} ) {
+            $cmdstats{ $hash{'Cmdstats'} }++;
+        }
+
+        &VERB( 'hooks: End of command.', 2 );
+
+        $done = 1;
     }
 
     return 1 if ($done);
@@ -154,141 +160,150 @@ sub parseCmdHook {
 }
 
 sub Modules {
-    if (!defined $message) {
-	&WARN('Modules: message is undefined. should never happen.');
-	return;
+    if ( !defined $message ) {
+        &WARN('Modules: message is undefined. should never happen.');
+        return;
     }
 
-    my $debiancmd	 = 'conflicts?|depends?|desc|file|(?:d)?info|provides?';
-    $debiancmd		.= '|recommends?|suggests?|maint|maintainer';
+    my $debiancmd = 'conflicts?|depends?|desc|file|(?:d)?info|provides?';
+    $debiancmd .= '|recommends?|suggests?|maint|maintainer';
 
-    if ($message =~ /^($debiancmd)(\s+(.*))?$/i) {
-	return unless (&IsChanConfOrWarn('Debian'));
-	my $package = lc $3;
+    if ( $message =~ /^($debiancmd)(\s+(.*))?$/i ) {
+        return unless ( &IsChanConfOrWarn('Debian') );
+        my $package = lc $3;
 
-	if (defined $package) {
-	    &Forker('Debian', sub { &Debian::infoPackages($1, $package); } );
-	} else {
-	    &help($1);
-	}
+        if ( defined $package ) {
+            &Forker( 'Debian', sub { &Debian::infoPackages( $1, $package ); } );
+        }
+        else {
+            &help($1);
+        }
 
-	return;
+        return;
     }
 
     # google searching. Simon++
-    my $w3search_regex   = 'google';
-    if ($message =~ /^(?:search\s+)?($w3search_regex)\s+(?:for\s+)?['"]?(.*?)["']?\s*\?*$/i) {
-	return unless (&IsChanConfOrWarn('W3Search'));
+    my $w3search_regex = 'google';
+    if ( $message =~
+        /^(?:search\s+)?($w3search_regex)\s+(?:for\s+)?['"]?(.*?)["']?\s*\?*$/i
+      )
+    {
+        return unless ( &IsChanConfOrWarn('W3Search') );
 
-	&Forker('W3Search', sub { &W3Search::W3Search($1,$2); } );
+        &Forker( 'W3Search', sub { &W3Search::W3Search( $1, $2 ); } );
 
-	$cmdstats{'W3Search'}++;
-	return;
+        $cmdstats{'W3Search'}++;
+        return;
     }
 
     # text counters. (eg: hehstats)
     my $itc;
     $itc = &getChanConf('ircTextCounters');
     $itc = &findChanConf('ircTextCounters') unless ($itc);
-    return if ($itc && &do_text_counters($itc) == 1);
+    return if ( $itc && &do_text_counters($itc) == 1 );
+
     # end of text counters.
 
     # list{keys|values}. xk++. Idea taken from #linuxwarez@EFNET
-    if ($message =~ /^list(\S+)(\s+(.*))?$/i) {
-	return unless (&IsChanConfOrWarn('Search'));
+    if ( $message =~ /^list(\S+)(\s+(.*))?$/i ) {
+        return unless ( &IsChanConfOrWarn('Search') );
 
-	my $thiscmd	= lc $1;
-	my $args	= $3 || '';
+        my $thiscmd = lc $1;
+        my $args = $3 || '';
 
-	$thiscmd	=~ s/^vals$/values/;
-	return if ($thiscmd ne 'keys' && $thiscmd ne 'values');
+        $thiscmd =~ s/^vals$/values/;
+        return if ( $thiscmd ne 'keys' && $thiscmd ne 'values' );
 
-	# Usage:
-	if (!defined $args or $args =~ /^\s*$/) {
-	    &help('list'. $thiscmd);
-	    return;
-	}
+        # Usage:
+        if ( !defined $args or $args =~ /^\s*$/ ) {
+            &help( 'list' . $thiscmd );
+            return;
+        }
 
-	# suggested by asuffield and \broken.
-	if ($args =~ /^["']/ and $args =~ /["']$/) {
-	    &DEBUG('list*: removed quotes.');
-	    $args	=~ s/^["']|["']$//g;
-	}
+        # suggested by asuffield and \broken.
+        if ( $args =~ /^["']/ and $args =~ /["']$/ ) {
+            &DEBUG('list*: removed quotes.');
+            $args =~ s/^["']|["']$//g;
+        }
 
-	if (length $args < 2 && &IsFlag('o') ne 'o') {
-	    &msg($who, 'search string is too short.');
-	    return;
-	}
+        if ( length $args < 2 && &IsFlag('o') ne 'o' ) {
+            &msg( $who, 'search string is too short.' );
+            return;
+        }
 
-	&Forker('Search', sub { &Search::Search($thiscmd, $args); } );
+        &Forker( 'Search', sub { &Search::Search( $thiscmd, $args ); } );
 
-	$cmdstats{'Factoid Search'}++;
-	return;
+        $cmdstats{'Factoid Search'}++;
+        return;
     }
 
     # Topic management. xk++
     # may want to add a userflags for topic. -xk
-    if ($message =~ /^topic(\s+(.*))?$/i) {
-	return unless (&IsChanConfOrWarn('Topic'));
-
-	my $chan	= $talkchannel;
-	my @args	= split / /, $2 || '';
-
-	if (!scalar @args) {
-	    &msg($who,"Try 'help topic'");
-	    return;
-	}
-
-	$chan		= lc(shift @args) if ($msgType eq 'private');
-	my $thiscmd	= shift @args;
-
-	# topic over public:
-	if ($msgType eq 'public' && $thiscmd =~ /^#/) {
-	    &msg($who, 'error: channel argument is not required.');
-	    &msg($who, "\002Usage\002: topic <CMD>");
-	    return;
-	}
-
-	# topic over private:
-	if ($msgType eq 'private' && $chan !~ /^#/) {
-	    &msg($who, 'error: channel argument is required.');
-	    &msg($who, "\002Usage\002: topic #channel <CMD>");
-	    return;
-	}
-
-	if (&validChan($chan) == 0) {
-	    &msg($who,"error: invalid channel \002$chan\002");
-	    return;
-	}
-
-	# for semi-outsiders.
-	if (!&IsNickInChan($who,$chan)) {
-	    &msg($who, "Failed. You ($who) are not in $chan, hey?");
-	    return;
-	}
-
-	# now lets do it.
-	&loadMyModule('Topic');
-	&Topic($chan, $thiscmd, join(' ', @args));
-	$cmdstats{'Topic'}++;
-	return;
+    if ( $message =~ /^topic(\s+(.*))?$/i ) {
+        return unless ( &IsChanConfOrWarn('Topic') );
+
+        my $chan = $talkchannel;
+        my @args = split / /, $2 || '';
+
+        if ( !scalar @args ) {
+            &msg( $who, "Try 'help topic'" );
+            return;
+        }
+
+        $chan = lc( shift @args ) if ( $msgType eq 'private' );
+        my $thiscmd = shift @args;
+
+        # topic over public:
+        if ( $msgType eq 'public' && $thiscmd =~ /^#/ ) {
+            &msg( $who, 'error: channel argument is not required.' );
+            &msg( $who, "\002Usage\002: topic <CMD>" );
+            return;
+        }
+
+        # topic over private:
+        if ( $msgType eq 'private' && $chan !~ /^#/ ) {
+            &msg( $who, 'error: channel argument is required.' );
+            &msg( $who, "\002Usage\002: topic #channel <CMD>" );
+            return;
+        }
+
+        if ( &validChan($chan) == 0 ) {
+            &msg( $who, "error: invalid channel \002$chan\002" );
+            return;
+        }
+
+        # for semi-outsiders.
+        if ( !&IsNickInChan( $who, $chan ) ) {
+            &msg( $who, "Failed. You ($who) are not in $chan, hey?" );
+            return;
+        }
+
+        # now lets do it.
+        &loadMyModule('Topic');
+        &Topic( $chan, $thiscmd, join( ' ', @args ) );
+        $cmdstats{'Topic'}++;
+        return;
     }
 
     # wingate.
-    if ($message =~ /^wingate$/i) {
-	return unless (&IsChanConfOrWarn('Wingate'));
+    if ( $message =~ /^wingate$/i ) {
+        return unless ( &IsChanConfOrWarn('Wingate') );
 
-	my $reply = "Wingate statistics: scanned \002"
-			.scalar(keys %wingateToDo)."\002 hosts";
-	my $queue = scalar(keys %wingateToDo);
-	if ($queue) {
-	    $reply .= ".  I have \002$queue\002 hosts in the queue";
-	    $reply .= '.  Started the scan '.&Time2String(time() - $wingaterun).' ago';
-	}
+        my $reply =
+            "Wingate statistics: scanned \002"
+          . scalar( keys %wingateToDo )
+          . "\002 hosts";
+        my $queue = scalar( keys %wingateToDo );
+        if ($queue) {
+            $reply .= ".  I have \002$queue\002 hosts in the queue";
+            $reply .=
+              '.  Started the scan '
+              . &Time2String( time() - $wingaterun ) . ' ago';
+        }
 
-	&performStrictReply("$reply.");
+        &performStrictReply("$reply.");
 
-	return;
+        return;
     }
 
     # do nothing and let the other routines have a go
@@ -298,52 +313,58 @@ sub Modules {
 # Uptime. xk++
 sub uptime {
     my $count = 1;
-    &msg($who, "- Uptime for $ident -");
-    &msg($who, "Now: ". &Time2String(&uptimeNow()) ." running $bot_version");
+    &msg( $who, "- Uptime for $ident -" );
+    &msg( $who,
+        'Now: ' . &Time2String( &uptimeNow() ) . " running $bot_version" );
 
-    foreach (&uptimeGetInfo()) {
-	/^(\d+)\.\d+ (.*)/;
-	my $time = &Time2String($1);
-	my $info = $2;
+    foreach ( &uptimeGetInfo() ) {
+        /^(\d+)\.\d+ (.*)/;
+        my $time = &Time2String($1);
+        my $info = $2;
 
-	&msg($who, "$count: $time $2");
-	$count++;
+        &msg( $who, "$count: $time $2" );
+        $count++;
     }
 }
 
 # seen.
 sub seen {
-    my($person) = lc shift;
+    my ($person) = lc shift;
     $person =~ s/\?*$//;
 
-    if (!defined $person or $person =~ /^$/) {
-	&help('seen');
+    if ( !defined $person or $person =~ /^$/ ) {
+        &help('seen');
 
-	my $i = &countKeys('seen');
-	&msg($who,'there '. &fixPlural('is',$i) ." \002$i\002 ".
-		'seen '. &fixPlural('entry',$i) .' that I know of.');
+        my $i = &countKeys('seen');
+        &msg( $who,
+                'there '
+              . &fixPlural( 'is', $i )
+              . " \002$i\002 " . 'seen '
+              . &fixPlural( 'entry', $i )
+              . ' that I know of.' );
 
-	return;
+        return;
     }
 
     my @seen;
 
-    &seenFlush();	# very evil hack. oh well, better safe than sorry.
+    &seenFlush();    # very evil hack. oh well, better safe than sorry.
 
     # TODO: convert to &sqlSelectRowHash();
     my $select = 'nick,time,channel,host,message';
-    if ($person eq 'random') {
-	@seen = &randKey('seen', $select);
-    } else {
-	@seen = &sqlSelect('seen', $select, { nick => $person } );
+    if ( $person eq 'random' ) {
+        @seen = &randKey( 'seen', $select );
+    }
+    else {
+        @seen = &sqlSelect( 'seen', $select, { nick => $person } );
     }
 
-    if (scalar @seen < 2) {
-	foreach (@seen) {
-	    &DEBUG("seen: _ => '$_'.");
-	}
-	&performReply("i haven't seen '$person'");
-	return;
+    if ( scalar @seen < 2 ) {
+        foreach (@seen) {
+            &DEBUG("seen: _ => '$_'.");
+        }
+        &performReply("i haven't seen '$person'");
+        return;
     }
 
     # valid seen.
@@ -351,29 +372,35 @@ sub seen {
     ### TODO: multi channel support. may require &IsNick() to return
     ###	all channels or something.
 
-    my @chans = &getNickInChans($seen[0]);
-    if (scalar @chans) {
-	$reply = "$seen[0] is currently on";
-
-	foreach (@chans) {
-	    $reply .= ' '.$_;
-	    next unless (exists $userstats{lc $seen[0]}{'Join'});
-	    $reply .= ' ('.&Time2String(time() - $userstats{lc $seen[0]}{'Join'}).')';
-	}
-
-	if (&IsChanConf('seenStats') > 0) {
-	    my $i;
-	    $i = $userstats{lc $seen[0]}{'Count'};
-	    $reply .= ". Has said a total of \002$i\002 messages" if (defined $i);
-	    $i = $userstats{lc $seen[0]}{'Time'};
-	    $reply .= '. Is idling for '.&Time2String(time() - $i) if (defined $i);
-	}
-	$reply .= ", last said\002:\002 '$seen[4]'.";
-    } else {
-	my $howlong = &Time2String(time() - $seen[1]);
-	$reply = "$seen[0] <$seen[3]> was last seen on IRC ".
-		 "in channel $seen[2], $howlong ago, ".
-		 "saying\002:\002 '$seen[4]'.";
+    my @chans = &getNickInChans( $seen[0] );
+    if ( scalar @chans ) {
+        $reply = "$seen[0] is currently on";
+
+        foreach (@chans) {
+            $reply .= ' ' . $_;
+            next unless ( exists $userstats{ lc $seen[0] }{'Join'} );
+            $reply .= ' ('
+              . &Time2String( time() - $userstats{ lc $seen[0] }{'Join'} )
+              . ')';
+        }
+
+        if ( &IsChanConf('seenStats') > 0 ) {
+            my $i;
+            $i = $userstats{ lc $seen[0] }{'Count'};
+            $reply .= ". Has said a total of \002$i\002 messages"
+              if ( defined $i );
+            $i = $userstats{ lc $seen[0] }{'Time'};
+            $reply .= '. Is idling for ' . &Time2String( time() - $i )
+              if ( defined $i );
+        }
+        $reply .= ", last said\002:\002 '$seen[4]'.";
+    }
+    else {
+        my $howlong = &Time2String( time() - $seen[1] );
+        $reply =
+            "$seen[0] <$seen[3]> was last seen on IRC "
+          . "in channel $seen[2], $howlong ago, "
+          . "saying\002:\002 '$seen[4]'.";
     }
 
     &performStrictReply($reply);
@@ -382,26 +409,28 @@ sub seen {
 
 # User Information Services. requested by Flugh.
 sub userinfo {
-    my ($arg) = join(' ',@_);
-
-    if ($arg =~ /^set(\s+(.*))?$/i) {
-	$arg = $2;
-	if (!defined $arg) {
-	    &help('userinfo set');
-	    return;
-	}
-
-	&UserInfoSet(split /\s+/, $arg, 2);
-    } elsif ($arg =~ /^unset(\s+(.*))?$/i) {
-	$arg = $2;
-	if (!defined $arg) {
-	    &help('userinfo unset');
-	    return;
-	}
-
-	&UserInfoSet($arg, '');
-    } else {
-	&UserInfoGet($arg);
+    my ($arg) = join( ' ', @_ );
+
+    if ( $arg =~ /^set(\s+(.*))?$/i ) {
+        $arg = $2;
+        if ( !defined $arg ) {
+            &help('userinfo set');
+            return;
+        }
+
+        &UserInfoSet( split /\s+/, $arg, 2 );
+    }
+    elsif ( $arg =~ /^unset(\s+(.*))?$/i ) {
+        $arg = $2;
+        if ( !defined $arg ) {
+            &help('userinfo unset');
+            return;
+        }
+
+        &UserInfoSet( $arg, '' );
+    }
+    else {
+        &UserInfoGet($arg);
     }
 }
 
@@ -410,90 +439,96 @@ sub cookie {
     my ($arg) = @_;
 
     # lets find that secret cookie.
-    my $target		= ($msgType ne 'public') ? $who : $talkchannel;
-    my $cookiemsg	= &getRandom(keys %{ $lang{'cookie'} });
-    my ($key,$value);
+    my $target = ( $msgType ne 'public' ) ? $who : $talkchannel;
+    my $cookiemsg = &getRandom( keys %{ $lang{'cookie'} } );
+    my ( $key, $value );
 
     ### WILL CHEW TONS OF MEM.
     ### TODO: convert this to a Forker function!
     if ($arg) {
-	my @list = &searchTable('factoids', 'factoid_key', 'factoid_value', $arg);
-	$key	= &getRandom(@list);
-	$value	= &getFactInfo($key, 'factoid_value');
-    } else {
-	($key,$value) = &randKey('factoids','factoid_key,factoid_value');
+        my @list =
+          &searchTable( 'factoids', 'factoid_key', 'factoid_value', $arg );
+        $key = &getRandom(@list);
+        $value = &getFactInfo( $key, 'factoid_value' );
+    }
+    else {
+        ( $key, $value ) = &randKey( 'factoids', 'factoid_key,factoid_value' );
     }
 
     for ($cookiemsg) {
-	s/##KEY/\002$key\002/;
-	s/##VALUE/$value/;
-	s/##WHO/$who/;
-	s/\$who/$who/;	# cheap fix.
-	s/(\S+)?\s*<\S+>/$1 /;
-	s/\s+/ /g;
+        s/##KEY/\002$key\002/;
+        s/##VALUE/$value/;
+        s/##WHO/$who/;
+        s/\$who/$who/;    # cheap fix.
+        s/(\S+)?\s*<\S+>/$1 /;
+        s/\s+/ /g;
     }
 
-    if ($cookiemsg =~ s/^ACTION //i) {
-	&action($target, $cookiemsg);
-    } else {
-	&msg($target, $cookiemsg);
+    if ( $cookiemsg =~ s/^ACTION //i ) {
+        &action( $target, $cookiemsg );
+    }
+    else {
+        &msg( $target, $cookiemsg );
     }
 }
 
 sub convert {
-    my $arg = join(' ',@_);
-    my ($from,$to) = ('','');
+    my $arg = join( ' ', @_ );
+    my ( $from, $to ) = ( '', '' );
 
-    ($from,$to) = ($1,$2) if ($arg =~ /^(.*?) to (.*)$/i);
-    ($from,$to) = ($2,$1) if ($arg =~ /^(.*?) from (.*)$/i);
+    ( $from, $to ) = ( $1, $2 ) if ( $arg =~ /^(.*?) to (.*)$/i );
+    ( $from, $to ) = ( $2, $1 ) if ( $arg =~ /^(.*?) from (.*)$/i );
 
-    if (!$to or !$from) {
-	&msg($who, 'Invalid format!');
-	&help('convert');
-	return;
+    if ( !$to or !$from ) {
+        &msg( $who, 'Invalid format!' );
+        &help('convert');
+        return;
     }
 
-    &Units::convertUnits($from, $to);
+    &Units::convertUnits( $from, $to );
 
     return;
 }
 
 sub lart {
-    my ($target) = &fixString($_[0]);
-    my $extra	= 0;
-    my $chan	= $talkchannel;
+    my ($target) = &fixString( $_[0] );
+    my $extra    = 0;
+    my $chan     = $talkchannel;
     my ($for);
     my $mynick = $conn->nick();
 
-    if ($msgType eq 'private') {
-	if ($target =~ /^($mask{chan})\s+(.*)$/) {
-	    $chan	= $1;
-	    $target	= $2;
-	    $extra	= 1;
-	} else {
-	    &msg($who, 'error: invalid format or missing arguments.');
-	    &help('lart');
-	    return;
-	}
-    }
-    if ($target =~ /^(.*)(\s+for\s+.*)$/) {
-	$target	= $1;
-	$for	= $2;
-    }
-
-    my $line = &getRandomLineFromFile($bot_data_dir. '/infobot.lart');
-    if (defined $line) {
-	if ($target =~ /^(me|you|itself|\Q$mynick\E)$/i) {
-	    $line =~ s/WHO/$who/g;
-	} else {
-	    $line =~ s/WHO/$target/g;
-	}
-	$line .= $for if ($for);
-	$line .= ", courtesy of $who" if ($extra);
-
-	&action($chan, $line);
-    } else {
-	&status('lart: error reading file?');
+    if ( $msgType eq 'private' ) {
+        if ( $target =~ /^($mask{chan})\s+(.*)$/ ) {
+            $chan   = $1;
+            $target = $2;
+            $extra  = 1;
+        }
+        else {
+            &msg( $who, 'error: invalid format or missing arguments.' );
+            &help('lart');
+            return;
+        }
+    }
+    if ( $target =~ /^(.*)(\s+for\s+.*)$/ ) {
+        $target = $1;
+        $for    = $2;
+    }
+
+    my $line = &getRandomLineFromFile( $bot_data_dir . '/infobot.lart' );
+    if ( defined $line ) {
+        if ( $target =~ /^(me|you|itself|\Q$mynick\E)$/i ) {
+            $line =~ s/WHO/$who/g;
+        }
+        else {
+            $line =~ s/WHO/$target/g;
+        }
+        $line .= $for if ($for);
+        $line .= ", courtesy of $who" if ($extra);
+
+        &action( $chan, $line );
+    }
+    else {
+        &status('lart: error reading file?');
     }
 }
 
@@ -503,342 +538,242 @@ sub DebianNew {
     my %pkg;
     my @new;
 
-    $error++ unless ( -e $idx);
-    $error++ unless ( -e "$idx-old");
+    $error++ unless ( -e $idx );
+    $error++ unless ( -e "$idx-old" );
 
     if ($error) {
-	$error = 'no sid/sid-old index file found.';
-	&ERROR("Debian: $error");
-	&msg($who, $error);
-	return;
+        $error = 'no sid/sid-old index file found.';
+        &ERROR("Debian: $error");
+        &msg( $who, $error );
+        return;
     }
 
-    open(IDX1, $idx);
-    open(IDX2, "$idx-old");
+    open( IDX1, $idx );
+    open( IDX2, "$idx-old" );
 
     while (<IDX2>) {
-	chop;
-	next if (/^\*/);
+        chop;
+        next if (/^\*/);
 
-	$pkg{$_} = 1;
+        $pkg{$_} = 1;
     }
     close IDX2;
 
-    open(IDX1,$idx);
+    open( IDX1, $idx );
     while (<IDX1>) {
-	chop;
-	next if (/^\*/);
-	next if (exists $pkg{$_});
+        chop;
+        next if (/^\*/);
+        next if ( exists $pkg{$_} );
 
-	push(@new, $_);
+        push( @new, $_ );
     }
     close IDX1;
 
-    &::performStrictReply( &::formListReply(0, 'New debian packages:', @new) );
+    &::performStrictReply(
+        &::formListReply( 0, 'New debian packages:', @new ) );
 }
 
 sub do_verstats {
-    my ($chan)	= @_;
-
-    if (!defined $chan) {
-	&help('verstats');
-	return;
-    }
-
-    if (!&validChan($chan)) {
-	&msg($who, "chan $chan is invalid.");
-	return;
-    }
-
-    if (scalar @vernick > scalar(keys %{ $channels{lc $chan}{''} })/4) {
-	&msg($who, 'verstats already in progress for someone else.');
-	return;
-    }
-
-    &msg($who, "Sending CTCP VERSION to $chan; results in 60s.");
-    $conn->ctcp('VERSION', $chan);
-    $cache{verstats}{chan}	= $chan;
-    $cache{verstats}{who}	= $who;
-    $cache{verstats}{msgType}	= $msgType;
-
-    $conn->schedule(30, sub {
-	my $c		= lc $cache{verstats}{chan};
-	@vernicktodo	= ();
-
-	foreach (keys %{ $channels{$c}{''} } ) {
-	    next if (grep /^\Q$_\E$/i, @vernick);
-	    push(@vernicktodo, $_);
-	}
-
-	&verstats_flush();
-    } );
-
-    $conn->schedule(60, sub {
-	my $vtotal	= 0;
-	my $c		= lc $cache{verstats}{chan};
-	my $total	= keys %{ $channels{$c}{''} };
-	$chan		= $c;
-	$who		= $cache{verstats}{who};
-	$msgType	= $cache{verstats}{msgType};
-	delete $cache{verstats};	# sufficient?
-
-	foreach (keys %ver) {
-	    $vtotal	+= scalar keys %{ $ver{$_} };
-	}
-
-	my %sorted;
-	my $unknown	= $total - $vtotal;
-	my $perc	= sprintf("%.1f", $unknown * 100 / $total);
-	$perc		=~ s/.0$//;
-	$sorted{$perc}{'unknown/cloak'} = "$unknown ($perc%)" if ($unknown);
-
-	foreach (keys %ver) {
-	    my $count	= scalar keys %{ $ver{$_} };
-	    $perc	= sprintf("%.01f", $count * 100 / $total);
-	    $perc	=~ s/.0$//;	# lame compression.
-
-	    $sorted{$perc}{$_} = "$count ($perc%)";
-	}
-
-	### can be compressed to a map?
-	my @list;
-	foreach ( sort { $b <=> $a } keys %sorted ) {
-	    my $perc = $_;
-	    foreach (sort keys %{ $sorted{$perc} }) {
-		push(@list, "$_ - $sorted{$perc}{$_}");
-	    }
-	}
-
-	# hack. this is one major downside to scheduling.
-	$chan = $c;
-	&performStrictReply( &formListReply(0, "IRC Client versions for $c ", @list) );
-
-	# clean up not-needed data structures.
-	undef %ver;
-	undef @vernick;
-    } );
-
-    return;
-}
+    my ($chan) = @_;
 
-sub verstats_flush {
-    for (1..5) {
-	last unless (scalar @vernicktodo);
+    if ( !defined $chan ) {
+        &help('verstats');
+        return;
+    }
 
-	my $n = shift(@vernicktodo);
-	$conn->ctcp('VERSION', $n);
+    if ( !&validChan($chan) ) {
+        &msg( $who, "chan $chan is invalid." );
+        return;
     }
 
-    return unless (scalar @vernicktodo);
+    if ( scalar @vernick > scalar( keys %{ $channels{ lc $chan }{''} } ) / 4 ) {
+        &msg( $who, 'verstats already in progress for someone else.' );
+        return;
+    }
 
-    $conn->schedule(3, \&verstats_flush() );
-}
+    &msg( $who, "Sending CTCP VERSION to $chan; results in 60s." );
+    $conn->ctcp( 'VERSION', $chan );
+    $cache{verstats}{chan}    = $chan;
+    $cache{verstats}{who}     = $who;
+    $cache{verstats}{msgType} = $msgType;
 
-sub do_text_counters {
-    my ($itc) = @_;
-    $itc =~ s/([^\w\s])/\\$1/g;
-    my $z = join '|', split ' ', $itc;
+    $conn->schedule(
+        30,
+        sub {
+            my $c = lc $cache{verstats}{chan};
+            @vernicktodo = ();
 
-    if ($msgType eq 'privmsg' and $message =~ / ($mask{chan})$/) {
-	&DEBUG("ircTC: privmsg detected; chan = $1");
-	$chan = $1;
-    }
-
-    if ($message =~ /^_stats(\s+(\S+))$/i) {
-	&textstats_main($2);
-	return 1;
-    }
-
-    my ($type,$arg);
-    if ($message =~ /^($z)stats(\s+(\S+))?$/i) {
-	$type = $1;
-	$arg  = $3;
-    } else {
-	return 0;
-    }
-
-    # even more uglier with channel/time arguments.
-    my $c	= $chan;
-#   my $c	= $chan || 'PRIVATE';
-    my $where	= 'type='.&sqlQuote($type);
-    if (defined $c) {
-	&DEBUG("c => $c");
-	$where	.= ' AND channel='.&sqlQuote($c) if (defined $c);
-    } else {
-	&DEBUG('not using chan arg');
-    }
-
-    my $sum = (&sqlRawReturn('SELECT SUM(counter) FROM stats'
-			.' WHERE '.$where ))[0];
-
-    if (!defined $arg or $arg =~ /^\s*$/) {
-	# this is way ugly.
-
-	# TODO: convert $where to hash
-	my %hash = &sqlSelectColHash('stats', 'nick,counter',
-			{ },
-			$where.' ORDER BY counter DESC LIMIT 3', 1
-	);
-	my $i;
-	my @top;
-
-	# unfortunately we have to sort it again!
-	my $tp = 0;
-	foreach $i (sort { $b <=> $a } keys %hash) {
-	    foreach (keys %{ $hash{$i} }) {
-		my $p	= sprintf("%.01f", 100*$i/$sum);
-		$tp	+= $p;
-		push(@top, "\002$_\002 -- $i ($p%)");
-	    }
-	}
-	my $topstr = '';
-	if (scalar @top) {
-	    $topstr = '.  Top '.scalar(@top).': '.join(', ', @top);
-	}
-
-	if (defined $sum) {
-	    &performStrictReply("total count of \037$type\037 on \002$c\002: $sum$topstr");
-	} else {
-	    &performStrictReply("zero counter for \037$type\037.");
-	}
-    } else {
-	# TODO: convert $where to hash and use a sqlSelect
-	my $x = (&sqlRawReturn('SELECT SUM(counter) FROM stats'.
-			" WHERE $where AND nick=".&sqlQuote($arg) ))[0];
-
-	if (!defined $x) {	# !defined.
-	    &performStrictReply("$arg has not said $type yet.");
-	    return 1;
-	}
-
-	# defined.
-	# TODO: convert $where to hash
-	my @array = &sqlSelect('stats', 'nick', undef,
-			$where.' ORDER BY counter', 1
-	);
-	my $good = 0;
-	my $i = 0;
-	for ($i=0; $i<scalar @array; $i++) {
-	    next unless ($array[0] =~ /^\Q$who\E$/);
-	    $good++;
-	    last;
-	}
-	$i++;
-
-	my $total = scalar(@array);
-	my $xtra = '';
-	if ($total and $good) {
-	    my $pct = sprintf("%.01f", 100*(1+$total-$i)/$total);
-	    $xtra = ", ranked $i\002/\002$total (percentile: \002$pct\002 %)";
-	}
-
-	my $pct1 = sprintf("%.01f", 100*$x/$sum);
-	&performStrictReply("\002$arg\002 has said \037$type\037 \002$x\002 times (\002$pct1\002 %)$xtra");
-    }
+            foreach ( keys %{ $channels{$c}{''} } ) {
+                next if ( grep /^\Q$_\E$/i, @vernick );
+                push( @vernicktodo, $_ );
+            }
 
-    return 1;
-}
+            &verstats_flush();
+        }
+    );
 
-sub textstats_main {
-    my($arg) = @_;
-
-    # even more uglier with channel/time arguments.
-    my $c	= $chan;
-#    my $c	= $chan || 'PRIVATE';
-    &DEBUG('not using chan arg') if (!defined $c);
-
-    # example of converting from RawReturn to sqlSelect.
-    my $where_href = (defined $c) ? { channel => $c } : '';
-    my $sum = &sqlSelect('stats', 'SUM(counter)', $where_href);
-
-    if (!defined $arg or $arg =~ /^\s*$/) {
-	# this is way ugly.
-	&DEBUG('_stats: !arg');
-
-	my %hash = &sqlSelectColHash('stats', 'nick,counter',
-		$where_href,
-		' ORDER BY counter DESC LIMIT 3', 1
-	);
-	my $i;
-	my @top;
-
-	# unfortunately we have to sort it again!
-	my $tp = 0;
-	foreach $i (sort { $b <=> $a } keys %hash) {
-	    foreach (keys %{ $hash{$i} }) {
-		my $p	= sprintf("%.01f", 100*$i/$sum);
-		$tp	+= $p;
-		push(@top, "\002$_\002 -- $i ($p%)");
-	    }
-	}
-
-	my $topstr = '';
-	if (scalar @top) {
-	    $topstr = '.  Top '.scalar(@top).': '.join(', ', @top);
-	}
-
-	if (defined $sum) {
-	    &performStrictReply("total count of \037$type\037 on \002$c\002: $sum$topstr");
-	} else {
-	    &performStrictReply("zero counter for \037$type\037.");
-	}
-
-	return;
-    }
-
-    # TODO: add nick to where_href
-    my %hash = &sqlSelectColHash('stats', 'type,counter',
-		$where_href, ' AND nick='.&sqlQuote($arg)
+    $conn->schedule(
+        60,
+        sub {
+            my $vtotal = 0;
+            my $c      = lc $cache{verstats}{chan};
+            my $total  = keys %{ $channels{$c}{''} };
+            $chan    = $c;
+            $who     = $cache{verstats}{who};
+            $msgType = $cache{verstats}{msgType};
+            delete $cache{verstats};    # sufficient?
+
+            foreach ( keys %ver ) {
+                $vtotal += scalar keys %{ $ver{$_} };
+            }
+
+            my %sorted;
+            my $unknown = $total - $vtotal;
+            my $perc = sprintf( '%.1f', $unknown * 100 / $total );
+            $perc =~ s/.0$//;
+            $sorted{$perc}{'unknown/cloak'} = "$unknown ($perc%)" if ($unknown);
+
+            foreach ( keys %ver ) {
+                my $count = scalar keys %{ $ver{$_} };
+                $perc = sprintf( '%.01f', $count * 100 / $total );
+                $perc =~ s/.0$//;    # lame compression.
+
+                $sorted{$perc}{$_} = "$count ($perc%)";
+            }
+
+            ### can be compressed to a map?
+            my @list;
+            foreach ( sort { $b <=> $a } keys %sorted ) {
+                my $perc = $_;
+                foreach ( sort keys %{ $sorted{$perc} } ) {
+                    push( @list, "$_ - $sorted{$perc}{$_}" );
+                }
+            }
+
+            # hack. this is one major downside to scheduling.
+            $chan = $c;
+            &performStrictReply(
+                &formListReply( 0, "IRC Client versions for $c ", @list ) );
+
+            # clean up not-needed data structures.
+            undef %ver;
+            undef @vernick;
+        }
     );
 
-    # this is totally messed up... needs to be fixed... and cleaned up.
-    my $total;
-    my $good;
-    my $ii;
-    my $x;
+    return;
+}
 
-    foreach (keys %hash) {
-	&DEBUG("_stats: hash{$_} => $hash{$_}");
-	# ranking.
-	# TODO: convert $where to hash
-	my $where = '';
-	my @array = &sqlSelect('stats', 'nick', undef, $where.' ORDER BY counter', 1);
-	$good = 0;
-	$ii = 0;
-	for(my $i=0; $i<scalar @array; $i++) {
-	    next unless ($array[0] =~ /^\Q$who\E$/);
-	    $good++;
-	    last;
-	}
-	$ii++;
+sub verstats_flush {
+    for ( 1 .. 5 ) {
+        last unless ( scalar @vernicktodo );
 
-	$total = scalar(@array);
-	&DEBUG("   i => $i, good => $good, total => $total");
-	$x .= ' '.$total.'blah blah';
+        my $n = shift(@vernicktodo);
+        $conn->ctcp( 'VERSION', $n );
     }
 
-#    return;
+    return unless ( scalar @vernicktodo );
 
-    if (!defined $x) {	# !defined.
-	&performStrictReply("$arg has not said $type yet.");
-	return;
-    }
+    $conn->schedule( 3, \&verstats_flush() );
+}
 
-    my $xtra = '';
-    if ($total and $good) {
-	my $pct = sprintf("%.01f", 100*(1+$total-$ii)/$total);
-	$xtra = ", ranked $ii\002/\002$total (percentile: \002$pct\002 %)";
-    }
+sub do_text_counters {
+    my ($itc) = @_;
+    $itc =~ s/([^\w\s])/\\$1/g;
+    my $z = join '|', split ' ', $itc;
 
-    my $pct1 = sprintf("%.01f", 100*$x/$sum);
-    &performStrictReply("\002$arg\002 has said \037$type\037 \002$x\002 times (\002$pct1\002 %)$xtra");
-}
+    if ( $msgType eq 'privmsg' and $message =~ / ($mask{chan})$/ ) {
+        &DEBUG("ircTC: privmsg detected; chan = $1");
+        $chan = $1;
+    }
+
+    my ( $type, $arg );
+    if ( $message =~ /^($z)stats(\s+(\S+))?$/i ) {
+        $type = $1;
+        $arg  = $3;
+    }
+    else {
+        return 0;
+    }
+
+    my $c = $chan || 'PRIVATE';
+
+    # Define various types of stats in one place.
+    # Note: sqlSelectColHash has built in sqlQuote
+    my $where_chan_type = { channel => $c, type => $type };
+    my $where_chan_type_nick = { channel => $c, type => $type, nick => $arg };
+
+    my $sum = ( &sqlSelect( 'stats', 'SUM(counter)', $where_chan_type ) )[0];
+
+    if ( !defined $arg or $arg =~ /^\s*$/ ) {
+
+        # get top 3 stats of $type in $chan
+        my %hash =
+          &sqlSelectColHash( 'stats', 'nick,counter', $where_chan_type,
+            'ORDER BY counter DESC LIMIT 3', 1 );
+        my $i;
+        my @top;
+
+        # unfortunately we have to sort it again!
+        my $tp = 0;
+        foreach $i ( sort { $b <=> $a } keys %hash ) {
+            foreach ( keys %{ $hash{$i} } ) {
+                my $p = sprintf( '%.01f', 100 * $i / $sum );
+                $tp += $p;
+                push( @top, "\002$_\002 -- $i ($p%)" );
+            }
+        }
+        my $topstr = '';
+        if ( scalar @top ) {
+            $topstr = '.  Top ' . scalar(@top) . ': ' . join( ', ', @top );
+        }
+
+        if ( defined $sum ) {
+            &performStrictReply(
+                "total count of \037$type\037 on \002$c\002: $sum$topstr");
+        }
+        else {
+            &performStrictReply("zero counter for \037$type\037.");
+        }
+    }
+    else {
+        my $x =
+          ( &sqlSelect( 'stats', 'SUM(counter)', $where_chan_type_nick ) )[0];
+
+        if ( !defined $x ) {    # If no stats were found
+            &performStrictReply("$arg has not said $type yet.");
+            return 1;
+        }
+
+        # Get list of all nicks for channel $c and $type
+        my @array =
+          &sqlSelectColArray( 'stats', 'nick', $where_chan_type,
+            'ORDER BY counter DESC' );
+
+        my $total = scalar(@array);
+        my $rank;
+
+        # Find position of nick $arg in the list
+        for ( my $i = 0 ; $i < $total ; $i++ ) {
+            next unless ( $array[$i] =~ /^\Q$arg\E$/ );
+            $rank = $i + 1;
+            last;
+        }
+
+        my $xtra;
+        if ( $total and $rank ) {
+            my $pct = sprintf( '%.01f', 100 * ($rank) / $total );
+            $xtra =
+              ", ranked $rank\002/\002$total (percentile: \002$pct\002 %)";
+        }
+
+        my $pct1 = sprintf( '%.01f', 100 * $x / $sum );
+        &performStrictReply(
+"\002$arg\002 has said \037$type\037 \002$x\002 times (\002$pct1\002 %)$xtra"
+        );
+    }
 
-sub nullski {
-    my ($arg) = @_;
-    return unless (defined $arg);
-    # big security hole
-    #foreach (`$arg`) { &msg($who,$_); }
+    return 1;
 }
 
 %cmdhooks=();
@@ -871,6 +806,7 @@ sub nullski {
 &addCmdHook('factinfo', ('CODEREF' => 'factinfo', 'Cmdstats' => 'Factoid Info', Module => 'Factoids', ) );
 &addCmdHook('factstats?', ('CODEREF' => 'factstats', 'Cmdstats' => 'Factoid Stats', Help => 'factstats', Forker => 1, 'Identifier' => 'Factoids', ) );
 &addCmdHook('help', ('CODEREF' => 'help', 'Cmdstats' => 'Help', ) );
+&addCmdHook('hex2ip', ('CODEREF' => 'hex2ip::query', 'Forker' => 1, 'Identifier' => 'hex2ip', 'Cmdstats' => 'hex2ip', 'Help' => 'hex2ip') );
 &addCmdHook('HTTPDtype', ('CODEREF' => 'HTTPDtype::HTTPDtype', 'Identifier' => 'HTTPDtype', 'Cmdstats' => 'HTTPDtype', 'Forker' => 1) );
 &addCmdHook('[ia]?spell', ('CODEREF' => 'spell::query', 'Identifier' => 'spell', 'Cmdstats' => 'spell', 'Forker' => 1, 'Help' => 'spell') );
 &addCmdHook('insult', ('CODEREF' => 'Insult::Insult', 'Forker' => 1, 'Identifier' => 'insult', 'Help' => 'insult' ) );
@@ -881,26 +817,27 @@ sub nullski {
 &addCmdHook('listauth', ('CODEREF' => 'CmdListAuth', 'Identifier' => 'Search', Module => 'Factoids', 'Help' => 'listauth') );
 &addCmdHook('md5(sum)?', ('CODEREF' => 'md5::md5', 'Identifier' => 'md5', 'Cmdstats' => 'md5', 'Forker' => 1, 'Module' => 'md5') );
 &addCmdHook('metar', ('CODEREF' => 'Weather::Metar', 'Identifier' => 'Weather', 'Help' => 'weather', 'Cmdstats' => 'Weather', 'Forker' => 1) );
-&addCmdHook('News', ('CODEREF' => 'News::Parse', Module => 'News', 'Cmdstats' => 'News' ) );
+&addCmdHook('News', ('CODEREF' => 'News::Parse', Module => 'News', 'Cmdstats' => 'News', 'Identifier' => 'News' ) );
 &addCmdHook('(?:nick|lame)ometer(?: for)?', ('CODEREF' => 'nickometer::query', 'Identifier' => 'nickometer', 'Cmdstats' => 'nickometer', 'Forker' => 1) );
-&addCmdHook('nullski', ('CODEREF' => 'nullski', ) );
+&addCmdHook('OnJoin', ('CODEREF' => 'Cmdonjoin', 'Identifier' => 'OnJoin', 'Module' => 'OnJoin') );
 &addCmdHook('page', ('CODEREF' => 'pager::page', 'Identifier' => 'pager', 'Cmdstats' => 'pager', 'Forker' => 1, 'Help' => 'page') );
 &addCmdHook('piglatin', ('CODEREF' => 'piglatin::piglatin', 'Identifier' => 'piglatin', 'Cmdstats' => 'piglatin', 'Forker' => 1) );
 &addCmdHook('Plug', ('CODEREF' => 'Plug::Plug', 'Identifier' => 'Plug', 'Forker' => 1, 'Cmdstats' => 'Plug') );
 &addCmdHook('quote', ('CODEREF' => 'Quote::Quote', 'Forker' => 1, 'Identifier' => 'Quote', 'Help' => 'quote', 'Cmdstats' => 'Quote') );
 &addCmdHook('reverse', ('CODEREF' => 'reverse::reverse', 'Identifier' => 'reverse', 'Cmdstats' => 'reverse', 'Forker' => 1, 'Module' => 'reverse') );
 &addCmdHook('RootWarn', ('CODEREF' => 'CmdrootWarn', 'Identifier' => 'RootWarn', 'Module' => 'RootWarn') );
-&addCmdHook('OnJoin', ('CODEREF' => 'Cmdonjoin', 'Identifier' => 'OnJoin', 'Module' => 'OnJoin') );
 &addCmdHook('Rss', ('CODEREF' => 'Rss::Rss', 'Identifier' => 'Rss', 'Cmdstats' => 'Rss', 'Forker' => 1, 'Help' => 'rss') );
+&addCmdHook('RSSFeeds',('CODEREF' => 'RSSFeeds::RSS', 'Identifier' => 'RSSFeeds', 'Forker' => 1, 'Help' => 'rssfeeds', 'Cmdstats' => 'RSSFeeds', 'Module' => 'RSSFeeds') );
 &addCmdHook('sched(stats|info)', ('CODEREF' => 'scheduleList', ) );
 &addCmdHook('scramble', ('CODEREF' => 'scramble::scramble', 'Identifier' => 'scramble', 'Cmdstats' => 'scramble', 'Forker' => 1, 'Module' => 'scramble') );
 &addCmdHook('seen', ('CODEREF' => 'seen', 'Identifier' => 'seen') );
 &addCmdHook('slashdot', ('CODEREF' => 'Slashdot::Slashdot', 'Identifier' => 'slashdot', 'Forker' => 1, 'Cmdstats' => 'slashdot') );
 &addCmdHook('tell|explain', ('CODEREF' => 'tell', Help => 'tell', Identifier => 'allowTelling', Cmdstats => 'Tell') );
 &addCmdHook('uc', ('CODEREF' => 'case::upper', 'Identifier' => 'case', 'Cmdstats' => 'case', 'Forker' => 1, 'Module' => 'case') );
+&addCmdHook('upsidedown', ('CODEREF' => 'upsidedown::upsidedown', 'Identifier' => 'upsidedown', 'Cmdstats' => 'upsidedown', 'Forker' => 1, 'Module' => 'upsidedown') );
 &addCmdHook('Uptime', ('CODEREF' => 'uptime', 'Identifier' => 'Uptime', 'Cmdstats' => 'Uptime') );
 &addCmdHook('u(ser)?info', ('CODEREF' => 'userinfo', 'Identifier' => 'UserInfo', 'Help' => 'userinfo', 'Module' => 'UserInfo') );
-&addCmdHook('verstats', ('CODEREF' => 'do_verstats' ) );
+&addCmdHook('verstats', ('CODEREF' => 'do_verstats', 'Identifier' => 'verstats', 'Help' => 'verstats', 'Cmdstats' => 'verstats') );
 &addCmdHook('Weather', ('CODEREF' => 'Weather::Weather', 'Identifier' => 'Weather', 'Help' => 'weather', 'Cmdstats' => 'Weather', 'Forker' => 1, 'Module' => 'Weather') );
 &addCmdHook('wiki(pedia)?', ('CODEREF' => 'wikipedia::wikipedia', 'Identifier' => 'wikipedia', 'Cmdstats' => 'wikipedia', 'Forker' => 1, 'Help' => 'wikipedia', 'Module' => 'wikipedia') );
 &addCmdHook('wtf', ('CODEREF' => 'wtf::query', 'Identifier' => 'wtf', 'Cmdstats' => 'wtf', 'Forker' => 1, 'Help' => 'wtf', 'Module' => 'wtf') );
@@ -911,6 +848,8 @@ sub nullski {
 ### END OF ADDING HOOKS.
 ###
 
-&status('loaded '.scalar(keys %cmdhooks).' command hooks.');
+&status( 'loaded ' . scalar( keys %cmdhooks ) . ' command hooks.' );
 
 1;
+
+# vim:ts=4:sw=4:expandtab:tw=80