rss -> Rss

[infobot.git] / src / CommandStubs.pl

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 512739a7c213cbd6749b64a2d1e90d61dcfb59e9..0bb6eb90978403658ab95597ec614c10a4c1044f 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -7,14 +7,13 @@
 # use strict;
 
 use vars qw($who $msgType $conn $chan $message $ident $talkchannel
-       $bot_version $babel_lang_regex $bot_data_dir);
+       $bot_version $bot_data_dir);
 use vars qw(@vernick @vernicktodo);
 use vars qw(%channels %cache %mask %userstats %myModules %cmdstats
        %hooks_extra %lang %ver);
 # FIX THE FOLLOWING:
 use vars qw($total $x $type $i $good);
 
-$babel_lang_regex = "de|ge|gr|el|sp|es|en|fr|it|ja|jp|ko|kr|nl|po|pt|ru|zh|zt";
 $w3search_regex   = "google";
 
 ### COMMAND HOOK IMPLEMENTATION.
@@ -163,37 +162,37 @@ sub parseCmdHook {
 ### START ADDING HOOKS.
 ###
 &addCmdHook("extra", 'd?bugs', ('CODEREF' => 'DBugs::Parse',
-       'Forker' => 1, 'Identifier' => 'debianExtra',
+       'Forker' => 1, 'Identifier' => 'DebianExtra',
        'Cmdstats' => 'Debian Bugs') );
 &addCmdHook("extra", 'dauthor', ('CODEREF' => 'Debian::searchAuthor',
-       'Forker' => 1, 'Identifier' => 'debian',
+       'Forker' => 1, 'Identifier' => 'Debian',
        'Cmdstats' => 'Debian Author Search', 'Help' => "dauthor" ) );
 &addCmdHook("extra", '(d|search)desc', ('CODEREF' => 'Debian::searchDescFE',
-       'Forker' => 1, 'Identifier' => 'debian',
+       'Forker' => 1, 'Identifier' => 'Debian',
        'Cmdstats' => 'Debian Desc Search', 'Help' => "ddesc" ) );
 &addCmdHook("extra", 'dnew', ('CODEREF' => 'DebianNew',
-       'Identifier' => 'debian' ) );
+       'Identifier' => 'Debian' ) );
 &addCmdHook("extra", 'dincoming', ('CODEREF' => 'Debian::generateIncoming',
-       'Forker' => 1, 'Identifier' => 'debian' ) );
+       'Forker' => 1, 'Identifier' => 'Debian' ) );
 &addCmdHook("extra", 'dstats', ('CODEREF' => 'Debian::infoStats',
-       'Forker' => 1, 'Identifier' => 'debian',
+       'Forker' => 1, 'Identifier' => 'Debian',
        'Cmdstats' => 'Debian Statistics' ) );
 &addCmdHook("extra", 'd?contents', ('CODEREF' => 'Debian::searchContents',
-       'Forker' => 1, 'Identifier' => 'debian',
+       'Forker' => 1, 'Identifier' => 'Debian',
        'Cmdstats' => 'Debian Contents Search', 'Help' => "contents" ) );
 &addCmdHook("extra", 'd?find', ('CODEREF' => 'Debian::DebianFind',
-       'Forker' => 1, 'Identifier' => 'debian',
+       'Forker' => 1, 'Identifier' => 'Debian',
        'Cmdstats' => 'Debian Search', 'Help' => "find" ) );
 &addCmdHook("extra", 'insult', ('CODEREF' => 'Insult::Insult',
        'Forker' => 1, 'Identifier' => 'insult', 'Help' => "insult" ) );
 &addCmdHook("extra", 'kernel', ('CODEREF' => 'Kernel::Kernel',
-       'Forker' => 1, 'Identifier' => 'kernel',
+       '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',
+       'Forker' => 1, 'Identifier' => 'Quote',
        'Help' => 'quote', 'Cmdstats' => 'Quote') );
 &addCmdHook("extra", 'countdown', ('CODEREF' => 'countdown',
        'Module' => 'countdown', 'Identifier' => 'countdown',
@@ -204,22 +203,22 @@ sub parseCmdHook {
        'Forker' => 1, 'Identifier' => 'units',
        'Help' => 'convert') );
 &addCmdHook("extra", '(cookie|random)', ('CODEREF' => 'cookie',
-       'Forker' => 1, 'Identifier' => 'factoids') );
+       'Forker' => 1, 'Identifier' => 'Factoids') );
 &addCmdHook("extra", 'u(ser)?info', ('CODEREF' => 'userinfo',
        'Identifier' => 'userinfo', 'Help' => 'userinfo',
        'Module' => 'userinfo') );
-&addCmdHook("extra", 'rootWarn', ('CODEREF' => 'CmdrootWarn',
-       'Identifier' => 'rootWarn', 'Module' => 'rootwarn') );
+&addCmdHook("extra", 'RootWarn', ('CODEREF' => 'CmdrootWarn',
+       'Identifier' => 'RootWarn', 'Module' => 'RootWarn') );
 &addCmdHook("extra", 'seen', ('CODEREF' => 'seen', 'Identifier' =>
        'seen') );
-&addCmdHook("extra", 'dict', ('CODEREF' => 'Dict::Dict',
-       'Identifier' => 'dict', 'Help' => 'dict',
+&addCmdHook("extra", 'Dict', ('CODEREF' => 'Dict::Dict',
+       'Identifier' => 'Dict', 'Help' => 'dict',
        'Forker' => 1, 'Cmdstats' => 'Dict') );
 &addCmdHook("extra", 'slashdot', ('CODEREF' => 'Slashdot::Slashdot',
        'Identifier' => 'slashdot', 'Forker' => 1,
        'Cmdstats' => 'Slashdot') );
-&addCmdHook("extra", 'plug', ('CODEREF' => 'Plug::Plug',
-       'Identifier' => 'plug', 'Forker' => 1,
+&addCmdHook("extra", 'Plug', ('CODEREF' => 'Plug::Plug',
+       'Identifier' => 'Plug', 'Forker' => 1,
        'Cmdstats' => 'Plug') );
 &addCmdHook("extra", 'uptime', ('CODEREF' => 'uptime', 'Identifier' => 'uptime',
        'Cmdstats' => 'Uptime') );
@@ -250,15 +249,15 @@ sub parseCmdHook {
        'Identifier' => 'zsi', 'Cmdstats' => 'zsi',
        'Forker' => 1) );
 &addCmdHook("extra", '(ex)?change', ('CODEREF' => 'Exchange::query',
-       'Identifier' => 'exchange', 'Cmdstats' => 'exchange',
+       'Identifier' => 'Exchange', 'Cmdstats' => 'Exchange',
        'Forker' => 1) );
 &addCmdHook("extra", '(botmail|message)', ('CODEREF' => 'botmail::parse',
        'Identifier' => 'botmail', 'Cmdstats' => 'botmail') );
 &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',
@@ -266,6 +265,9 @@ 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',
+       'Identifier' => 'babelfish', 'Cmdstats' => 'babelfish',
+       'Forker' => 1, 'Help' => 'babelfish') );
 ###
 ### END OF ADDING HOOKS.
 ###
@@ -277,25 +279,6 @@ sub Modules {
        return;
     }
 
-    # babelfish bot: Jonathan Feinberg++
-    if ($message =~ m{
-               ^\s*
-               (?:babel(?:fish)?|x|xlate|translate)
-               \s+
-               ($babel_lang_regex)\w*  # from language?
-               \s+
-               ($babel_lang_regex)\w*  # to language?
-               \s*
-               (.+)                    # The phrase to be translated
-    }xoi) {
-       return unless (&hasParam("babelfish"));
-
-       &Forker("babelfish", sub { &babelfish::babelfish(lc $1, lc $2, $3); } );
-
-       $cmdstats{'BabelFish'}++;
-       return;
-    }
-
     my $debiancmd       = 'conflicts?|depends?|desc|file|(?:d)?info|provides?';
     $debiancmd         .= '|recommends?|suggests?|maint|maintainer';