X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FCommandStubs.pl;h=c5bbea03d6ff501a6b1c0461e8cae281fd288191;hb=c7877684a5c39ee291211af2b4d0314aac98c961;hp=bdcaf0b107ed940672bbf059d0aac74331d4cfd6;hpb=17f941f1ee15c4490fed5aacf93f6f2bd728acc3;p=infobot.git diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl index bdcaf0b..c5bbea0 100644 --- a/src/CommandStubs.pl +++ b/src/CommandStubs.pl @@ -3,24 +3,23 @@ # WARN: this file does not reload on HUP. # -# use strict; # TODO +# TODO: +# 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 = "fr|sp|es|po|pt|it|ge|de|gr|en|zh|ja|jp|ko|kr|ru"; $w3search_regex = "google"; ### COMMAND HOOK IMPLEMENTATION. # addCmdHook("SECTION", 'TEXT_HOOK', -# (CODEREF => 'Blah', +# (CODEREF => 'Blah', # Forker => 1, -# CheckModule => 1, # ??? # Module => 'blah.pl' # preload module. # Identifier => 'config_label', # change to Config? # Help => 'help_label', @@ -125,7 +124,7 @@ sub parseCmdHook { } else { if (exists $hash{'Module'}) { - &loadMyModule($myModules{ $hash{'Module'} }); + &loadMyModule($hash{'Module'}); } # check if CODEREF exists. @@ -163,95 +162,112 @@ 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", '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', +&addCmdHook("extra", 'countdown', ('CODEREF' => 'countdown', 'Module' => 'countdown', 'Identifier' => 'countdown', - 'Cmdstats' => 'Countdown') ); + 'Cmdstats' => 'countdown') ); &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') ); + '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') ); + 'Identifier' => 'UserInfo', 'Help' => 'userinfo', + 'Module' => 'UserInfo') ); +&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, + '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) ); &addCmdHook("extra", 'bzflist', ('CODEREF' => 'BZFlag::list', - 'Identifier' => 'bzflag', 'Cmdstats' => 'BZFlag', + 'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag', + 'Forker' => 1) ); +&addCmdHook("extra", 'bzflist17', ('CODEREF' => 'BZFlag::list17', + 'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag', 'Forker' => 1) ); &addCmdHook("extra", 'bzfquery', ('CODEREF' => 'BZFlag::query', - 'Identifier' => 'bzflag', 'Cmdstats' => 'BZFlag', - 'Forker' => 1, 'Help' => 'bzflag') ); + 'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag', + 'Forker' => 1) ); &addCmdHook("extra", 'zfi', ('CODEREF' => 'zfi::query', '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', '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', +&addCmdHook("extra", 'HTTPDtype', ('CODEREF' => 'HTTPDtype::HTTPDtype', + 'Identifier' => 'HTTPDtype', 'Cmdstats' => 'HTTPDtype', 'Forker' => 1) ); - +&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', + 'Forker' => 1, 'Help' => 'wikipedia') ); +&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. ### @@ -263,34 +279,15 @@ sub Modules { return; } - # babel 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 { &babel::babelfish(lc $1, lc $2, $3); } ); - - $cmdstats{'BabelFish'}++; - return; - } - my $debiancmd = 'conflicts?|depends?|desc|file|(?:d)?info|provides?'; $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); } @@ -300,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; @@ -354,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."); @@ -413,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 || ""; @@ -452,7 +449,7 @@ sub Modules { } # now lets do it. - &loadMyModule($myModules{'topic'}); + &loadMyModule('Topic'); &Topic($chan, $thiscmd, join(' ', @args)); $cmdstats{'Topic'}++; return; @@ -460,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"; @@ -570,7 +567,7 @@ sub userinfo { if ($arg =~ /^set(\s+(.*))?$/i) { $arg = $2; if (!defined $arg) { - &help("userinfo set"); + &help('userinfo set'); return; } @@ -578,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); } @@ -645,6 +642,7 @@ sub lart { my ($target) = &fixString($_[0]); my $extra = 0; my $chan = $talkchannel; + my ($for); if ($msgType eq 'private') { if ($target =~ /^($mask{chan})\s+(.*)$/) { @@ -657,6 +655,10 @@ sub lart { return; } } + if ($target =~ /^(.*)(\s+for\s+.*)$/) { + $target = $1; + $for = $2; + } my $line = &getRandomLineFromFile($bot_data_dir. "/blootbot.lart"); if (defined $line) { @@ -665,6 +667,7 @@ sub lart { } else { $line =~ s/WHO/$target/g; } + $line .= $for if ($for); $line .= ", courtesy of $who" if ($extra); &action($chan, $line); @@ -850,7 +853,7 @@ sub do_text_counters { if (!defined $arg or $arg =~ /^\s*$/) { # this is way fucking ugly. - # TODO convert $where to hash + # TODO: convert $where to hash my %hash = &sqlSelectColHash("stats", "nick,counter", { }, $where." ORDER BY counter DESC LIMIT 3", 1 @@ -878,7 +881,7 @@ sub do_text_counters { &pSReply("zero counter for \037$type\037."); } } else { - # TODO convert $where to hash and use a sqlSelect + # TODO: convert $where to hash and use a sqlSelect my $x = (&sqlRawReturn("SELECT SUM(counter) FROM stats". " WHERE $where AND nick=".&sqlQuote($arg) ))[0]; @@ -888,7 +891,7 @@ sub do_text_counters { } # defined. - # TODO convert $where to hash + # TODO: convert $where to hash my @array = &sqlSelect("stats", "nick", undef, $where." ORDER BY counter", 1 ); @@ -962,7 +965,7 @@ sub textstats_main { return; } - # TODO add nick to where_href + # TODO: add nick to where_href my %hash = &sqlSelectColHash("stats", "type,counter", $where_href, " AND nick=".&sqlQuote($arg) ); @@ -975,7 +978,7 @@ sub textstats_main { foreach (keys %hash) { &DEBUG("_stats: hash{$_} => $hash{$_}"); # ranking. - # TODO convert $where to hash + # TODO: convert $where to hash my @array = &sqlSelect("stats", "nick", undef, $where." ORDER BY counter", 1); $good = 0; @@ -1009,7 +1012,11 @@ sub textstats_main { &pSReply("\002$arg\002 has said \037$type\037 \002$x\002 times (\002$pct1\002 %)$xtra"); } -sub nullski { my ($arg) = @_; return unless (defined $arg); - foreach (`$arg`) { &msg($who,$_); } } +sub nullski { + my ($arg) = @_; + return unless (defined $arg); + # big security hole + #foreach (`$arg`) { &msg($who,$_); } +} 1;