X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=blootbot%2Fsrc%2FCommandStubs.pl;h=65109a3a7bb5bd33ef9c64fadd3828be906dacd2;hb=ae14f8664df5586a37f18946972cb081abf4ca53;hp=c9ca19e5f4db8b75d2d6dbf7f27479126ac630a5;hpb=ed1107a2aff6ddbc19e911af2cfdf002f47ac36f;p=infobot.git

diff --git a/blootbot/src/CommandStubs.pl b/blootbot/src/CommandStubs.pl
index c9ca19e..65109a3 100644
--- a/blootbot/src/CommandStubs.pl
+++ b/blootbot/src/CommandStubs.pl
@@ -124,7 +124,7 @@ sub parseCmdHook {
 
 	} else {
 	    if (exists $hash{'Module'}) {
-		&loadMyModule($myModules{ $hash{'Module'} });
+		&loadMyModule($hash{'Module'});
 	    }
 
 	    # check if CODEREF exists.
@@ -161,7 +161,7 @@ sub parseCmdHook {
 ###
 ### START ADDING HOOKS.
 ###
-&addCmdHook("extra", 'd?bugs', ('CODEREF' => 'DBugs::Parse',
+&addCmdHook("extra", 'd?bugs', ('CODEREF' => 'DebianExtra::Parse',
 	'Forker' => 1, 'Identifier' => 'DebianExtra',
 	'Cmdstats' => 'Debian Bugs') );
 &addCmdHook("extra", 'dauthor', ('CODEREF' => 'Debian::searchAuthor',
@@ -189,7 +189,7 @@ sub parseCmdHook {
 	'Forker' => 1, 'Identifier' => 'Kernel',
 	'Cmdstats' => 'Kernel', 'NoArgs' => 1) );
 &addCmdHook("extra", 'listauth', ('CODEREF' => 'CmdListAuth',
-	'Identifier' => 'search', Module => 'Factoids',
+	'Identifier' => 'Search', Module => 'Factoids',
 	'Help' => 'listauth') );
 &addCmdHook("extra", 'quote', ('CODEREF' => 'Quote::Quote',
 	'Forker' => 1, 'Identifier' => 'Quote',
@@ -200,13 +200,13 @@ sub parseCmdHook {
 &addCmdHook("extra", 'lart', ('CODEREF' => 'lart',
 	'Identifier' => 'lart', 'Help' => 'lart') );
 &addCmdHook("extra", 'convert', ('CODEREF' => 'convert',
-	'Forker' => 1, 'Identifier' => 'units',
+	'Forker' => 1, 'Identifier' => 'Units',
 	'Help' => 'convert') );
 &addCmdHook("extra", '(cookie|random)', ('CODEREF' => 'cookie',
 	'Forker' => 1, 'Identifier' => 'Factoids') );
 &addCmdHook("extra", 'u(ser)?info', ('CODEREF' => 'userinfo',
-	'Identifier' => 'userinfo', 'Help' => 'userinfo',
-	'Module' => 'userinfo') );
+	'Identifier' => 'UserInfo', 'Help' => 'userinfo',
+	'Module' => 'UserInfo') );
 &addCmdHook("extra", 'RootWarn', ('CODEREF' => 'CmdrootWarn',
 	'Identifier' => 'RootWarn', 'Module' => 'RootWarn') );
 &addCmdHook("extra", 'seen', ('CODEREF' => 'seen', 'Identifier' =>
@@ -216,20 +216,20 @@ sub parseCmdHook {
 	'Forker' => 1, 'Cmdstats' => 'Dict') );
 &addCmdHook("extra", 'slashdot', ('CODEREF' => 'Slashdot::Slashdot',
 	'Identifier' => 'slashdot', 'Forker' => 1,
-	'Cmdstats' => 'Slashdot') );
+	'Cmdstats' => 'slashdot') );
 &addCmdHook("extra", 'Plug', ('CODEREF' => 'Plug::Plug',
 	'Identifier' => 'Plug', 'Forker' => 1,
 	'Cmdstats' => 'Plug') );
-&addCmdHook("extra", 'uptime', ('CODEREF' => 'uptime', 'Identifier' => 'uptime',
+&addCmdHook("extra", 'Uptime', ('CODEREF' => 'uptime', 'Identifier' => 'Uptime',
 	'Cmdstats' => 'Uptime') );
 &addCmdHook("extra", 'nullski', ('CODEREF' => 'nullski', ) );
 &addCmdHook("extra", 'verstats', ('CODEREF' => 'do_verstats' ) );
-&addCmdHook("extra", 'weather', ('CODEREF' => 'Weather::Weather',
-	'Identifier' => 'weather', 'Help' => 'weather',
-	'Cmdstats' => 'weather', 'Forker' => 1) );
+&addCmdHook("extra", 'Weather', ('CODEREF' => 'Weather::Weather',
+	'Identifier' => 'Weather', 'Help' => 'weather',
+	'Cmdstats' => 'Weather', 'Forker' => 1) );
 &addCmdHook("extra", 'metar', ('CODEREF' => 'Weather::Metar',
-	'Identifier' => 'weather', 'Help' => 'weather',
-	'Cmdstats' => 'weather', 'Forker' => 1) );
+	'Identifier' => 'Weather', 'Help' => 'weather',
+	'Cmdstats' => 'Weather', 'Forker' => 1) );
 &addCmdHook("extra", 'bzflist', ('CODEREF' => 'BZFlag::list',
 	'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag',
 	'Forker' => 1) );
@@ -243,7 +243,7 @@ sub parseCmdHook {
 	'Identifier' => 'zfi', 'Cmdstats' => 'zfi',
 	'Forker' => 1) );
 &addCmdHook("extra", '(zippy|yow)', ('CODEREF' => 'zippy::get',
-	'Identifier' => 'zippy', 'Cmdstats' => 'zippy',
+	'Identifier' => 'Zippy', 'Cmdstats' => 'Zippy',
 	'Forker' => 1) );
 &addCmdHook("extra", 'zsi', ('CODEREF' => 'zsi::query',
 	'Identifier' => 'zsi', 'Cmdstats' => 'zsi',
@@ -256,8 +256,8 @@ sub parseCmdHook {
 &addCmdHook("extra", 'HTTPDtype', ('CODEREF' => 'HTTPDtype::HTTPDtype',
 	'Identifier' => 'HTTPDtype', 'Cmdstats' => 'HTTPDtype',
 	'Forker' => 1) );
-&addCmdHook("extra", 'rss', ('CODEREF' => 'Rss::Rss',
-	'Identifier' => 'rss', 'Cmdstats' => 'rss',
+&addCmdHook("extra", 'Rss', ('CODEREF' => 'Rss::Rss',
+	'Identifier' => 'Rss', 'Cmdstats' => 'Rss',
 	'Forker' => 1, 'Help' => 'rss') );
 &addCmdHook("extra", 'wiki(pedia)?', ('CODEREF' => 'wikipedia::wikipedia',
 	'Identifier' => 'wikipedia', 'Cmdstats' => 'wikipedia',
@@ -265,7 +265,7 @@ sub parseCmdHook {
 &addCmdHook("extra", 'page', ('CODEREF' => 'pager::page',
 	'Identifier' => 'pager', 'Cmdstats' => 'pager',
 	'Forker' => 1, 'Help' => 'page') );
-&addCmdHook("extra", 'babel(fish)?|x|xlate|translate', ('CODEREF' => 'babelfish::babelfish',
+&addCmdHook("extra", '(babel(fish)?|x|xlate|translate)', ('CODEREF' => 'babelfish::babelfish',
 	'Identifier' => 'babelfish', 'Cmdstats' => 'babelfish',
 	'Forker' => 1, 'Help' => 'babelfish') );
 ###
@@ -283,11 +283,11 @@ sub Modules {
     $debiancmd		.= '|recommends?|suggests?|maint|maintainer';
 
     if ($message =~ /^($debiancmd)(\s+(.*))?$/i) {
-	return unless (&hasParam("debian"));
+	return unless (&hasParam('Debian'));
 	my $package = lc $3;
 
 	if (defined $package) {
-	    &Forker("debian", sub { &Debian::infoPackages($1, $package); } );
+	    &Forker('Debian', sub { &Debian::infoPackages($1, $package); } );
 	} else {
 	    &help($1);
 	}
@@ -297,49 +297,49 @@ sub Modules {
 
     # google searching. Simon++
     if ($message =~ /^(?:search\s+)?($w3search_regex)\s+(?:for\s+)?['"]?(.*?)["']?\s*\?*$/i) {
-	return unless (&hasParam("wwwsearch"));
+	return unless (&hasParam('W3Search'));
 
-	&Forker("wwwsearch", sub { &W3Search::W3Search($1,$2); } );
+	&Forker('W3Search', sub { &W3Search::W3Search($1,$2); } );
 
-	$cmdstats{'WWWSearch'}++;
+	$cmdstats{'W3Search'}++;
 	return;
     }
 
     # text counters. (eg: hehstats)
     my $itc;
-    $itc = &getChanConf("ircTextCounters");
-    $itc = &findChanConf("ircTextCounters") unless ($itc);
+    $itc = &getChanConf('ircTextCounters');
+    $itc = &findChanConf('ircTextCounters') unless ($itc);
     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 (&hasParam("search"));
+	return unless (&hasParam('Search'));
 
 	my $thiscmd	= lc $1;
 	my $args	= $3 || "";
 
 	$thiscmd	=~ s/^vals$/values/;
-	return if ($thiscmd ne "keys" && $thiscmd ne "values");
+	return if ($thiscmd ne 'keys' && $thiscmd ne 'values');
 
 	# Usage:
 	if (!defined $args or $args =~ /^\s*$/) {
-	    &help("list". $thiscmd);
+	    &help('list'. $thiscmd);
 	    return;
 	}
 
 	# suggested by asuffield and \broken.
 	if ($args =~ /^["']/ and $args =~ /["']$/) {
-	    &DEBUG("list*: removed quotes.");
+	    &DEBUG('list*: removed quotes.');
 	    $args	=~ s/^["']|["']$//g;
 	}
 
-	if (length $args < 2 && &IsFlag("o") ne "o") {
-	    &msg($who, "search string is too short.");
+	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;
@@ -351,7 +351,7 @@ sub Modules {
 
 	my $term = (lc $1 eq 'me') ? $who : $1;
 
-	&loadMyModule($myModules{'nickometer'});
+	&loadMyModule('nickometer');
 
 	if ($term =~ /^$mask{chan}$/) {
 	    &status("Doing nickometer for chan $term.");
@@ -410,7 +410,7 @@ sub Modules {
     # Topic management. xk++
     # may want to add a userflags for topic. -xk
     if ($message =~ /^topic(\s+(.*))?$/i) {
-	return unless (&hasParam("topic"));
+	return unless (&hasParam('Topic'));
 
 	my $chan	= $talkchannel;
 	my @args	= split / /, $2 || "";
@@ -449,7 +449,7 @@ sub Modules {
 	}
 
 	# now lets do it.
-	&loadMyModule($myModules{'topic'});
+	&loadMyModule('Topic');
 	&Topic($chan, $thiscmd, join(' ', @args));
 	$cmdstats{'Topic'}++;
 	return;
@@ -457,7 +457,7 @@ sub Modules {
 
     # wingate.
     if ($message =~ /^wingate$/i) {
-	return unless (&hasParam("wingate"));
+	return unless (&hasParam('Wingate'));
 
 	my $reply = "Wingate statistics: scanned \002"
 			.scalar(keys %wingate)."\002 hosts";
@@ -567,7 +567,7 @@ sub userinfo {
     if ($arg =~ /^set(\s+(.*))?$/i) {
 	$arg = $2;
 	if (!defined $arg) {
-	    &help("userinfo set");
+	    &help('userinfo set');
 	    return;
 	}
 
@@ -575,11 +575,11 @@ sub userinfo {
     } elsif ($arg =~ /^unset(\s+(.*))?$/i) {
 	$arg = $2;
 	if (!defined $arg) {
-	    &help("userinfo unset");
+	    &help('userinfo unset');
 	    return;
 	}
 
-	&UserInfoSet($arg, "");
+	&UserInfoSet($arg, '');
     } else {
 	&UserInfoGet($arg);
     }