woot! %myModules is dead

[infobot.git] / src / CommandStubs.pl

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index e48e5976bb0d43f0191d8b82ef3de5b3425e94b9..873c0ce7c1b410823d61de451306de19b6d94678 100644 (file)
--- a/src/CommandStubs.pl
+++ b/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.
@@ -224,12 +224,12 @@ sub parseCmdHook {
        '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',
@@ -297,11 +297,11 @@ 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;
     }
 
@@ -314,7 +314,7 @@ sub Modules {
 
     # 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 || "";
@@ -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.");
@@ -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";