X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FCommandStubs.pl;h=eb8e7df4adcbe0395d27f16a947c53ae5817fc27;hb=7e0510ccd408b7f6f83deca885eeca831a1eec6b;hp=eba7a50462bfee29f81632a2eec40bc92d167eb3;hpb=c53a047e7a5f63c954a2ce515687a937ca8720f3;p=infobot.git diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl index eba7a50..eb8e7df 100644 --- a/src/CommandStubs.pl +++ b/src/CommandStubs.pl @@ -3,15 +3,23 @@ # WARN: this file does not reload on HUP. # -if (&IsParam("useStrict")) { use strict; } +# TODO: +# use strict; -$babel_lang_regex = "fr|sp|po|pt|it|ge|de|gr|en"; +use vars qw($who $msgType $conn $chan $message $ident $talkchannel + $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); + +$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', @@ -35,7 +43,8 @@ sub addCmdHook { # RUN IF ADDRESSED. sub parseCmdHook { my ($hashname, $line) = @_; - $line =~ /^(\S+)( (.*))?$/; + $line =~ s/^\s+|\s+$//g; # again. + $line =~ /^(\S+)(\s+(.*))?$/; my $cmd = $1; # command name is whitespaceless. my $flatarg = $3; my @args = split(/\s+/, $flatarg || ''); @@ -64,7 +73,7 @@ sub parseCmdHook { next; } - &status("hooks($hashname): $cmd matched '$ident'"); + &status("hooks($hashname): $cmd matched '$ident' '$flatarg'"); my %hash = %{ ${"hooks_$hashname"}{$ident} }; if (!scalar keys %hash) { @@ -73,7 +82,7 @@ sub parseCmdHook { } if ($hash{NoArgs} and $flatarg) { - &DEBUG("cmd $ident does not take args; skipping."); + &DEBUG("cmd $ident does not take args ('$flatarg'); skipping."); next; } @@ -95,7 +104,7 @@ sub parseCmdHook { ### IDENTIFIER. if (exists $hash{'Identifier'}) { - return 1 unless (&hasParam($hash{'Identifier'})); + return 1 unless (&IsChanConfOrWarn($hash{'Identifier'})); } ### USER FLAGS. @@ -115,12 +124,12 @@ sub parseCmdHook { } else { if (exists $hash{'Module'}) { - &loadMyModule($myModules{ $hash{'Module'} }); + &loadMyModule($hash{'Module'}); } # check if CODEREF exists. if (!defined &{ $hash{'CODEREF'} }) { - &WARN("coderef $hash{'CODEREF'} don't exist."); + &WARN("coderef $hash{'CODEREF'} does not exist."); if (defined $who) { &msg($who, "coderef does not exist for $ident."); } @@ -152,70 +161,128 @@ sub parseCmdHook { ### ### START ADDING HOOKS. ### -&addCmdHook("extra", 'd?bugs', ('CODEREF' => 'DBugs::Parse', - 'Forker' => 1, 'Identifier' => 'debianExtra', +&addCmdHook("extra", 'd?bugs', ('CODEREF' => 'DebianExtra::Parse', + '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', +&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", 'uptime', ('CODEREF' => 'uptime', 'Identifier' => 'uptime', + 'Cmdstats' => 'slashdot') ); +&addCmdHook("extra", 'Plug', ('CODEREF' => 'Plug::Plug', + 'Identifier' => 'Plug', 'Forker' => 1, + 'Cmdstats' => 'Plug') ); +&addCmdHook("extra", 'Uptime', ('CODEREF' => 'uptime', 'Identifier' => 'Uptime', 'Cmdstats' => 'Uptime') ); &addCmdHook("extra", 'nullski', ('CODEREF' => 'nullski', ) ); -&addCmdHook("extra", '(fm|freshmeat)', ('CODEREF' => 'Freshmeat::Freshmeat', - 'Identifier' => 'freshmeat', 'Cmdstats' => 'Freshmeat', - 'Forker' => 1, 'Help' => 'freshmeat') ); &addCmdHook("extra", 'verstats', ('CODEREF' => 'do_verstats' ) ); - +&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', + '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) ); +&addCmdHook("extra", 'zfi', ('CODEREF' => 'zfi::query', + 'Identifier' => 'zfi', 'Cmdstats' => 'zfi', + 'Forker' => 1) ); +&addCmdHook("extra", '(zippy|yow)', ('CODEREF' => 'zippy::get', + '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', + '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", 'scramble', ('CODEREF' => 'scramble::scramble', + 'Identifier' => 'scramble', 'Cmdstats' => 'scramble', + 'Forker' => 1) ); +&addCmdHook("extra", 'md5(sum)?', ('CODEREF' => 'md5::md5', + 'Identifier' => 'md5', 'Cmdstats' => 'md5', + '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') ); +&addCmdHook("extra", 'wtf', ('CODEREF' => 'wtf::query', + 'Identifier' => 'wtf', 'Cmdstats' => 'wtf', + 'Forker' => 1, 'Help' => 'wtf') ); +&addCmdHook("extra", '[ia]?spell', ('CODEREF' => 'spell::query', + 'Identifier' => 'spell', 'Cmdstats' => 'spell', + 'Forker' => 1, 'Help' => 'spell') ); +&addCmdHook("extra", 'dns|d?nslookup|host', ('CODEREF' => 'dns::query', + 'Identifier' => 'dns', 'Cmdstats' => 'dns', + 'Forker' => 1, 'Help' => 'dns') ); ### ### END OF ADDING HOOKS. ### @@ -227,34 +294,15 @@ sub Modules { return; } - # babel bot: Jonathan Feinberg++ - if ($message =~ m{ - ^\s* - (?:babel(?:fish)?|x|xlate|translate) - \s+ - (to|from) # direction of translation (through) - \s+ - ($babel_lang_regex)\w* # which 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|info|provides?'; + 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 (&IsChanConfOrWarn('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); } @@ -263,103 +311,50 @@ sub Modules { } # google searching. Simon++ - if ($message =~ /^(?:search\s+)?(\S+)\s+for\s+['"]?(.*?)["']?\s*\?*$/i) { - return unless (&hasParam("wwwsearch")); + if ($message =~ /^(?:search\s+)?($w3search_regex)\s+(?:for\s+)?['"]?(.*?)["']?\s*\?*$/i) { + return unless (&IsChanConfOrWarn('W3Search')); - &Forker("wwwsearch", sub { &W3Search::W3Search($1,$2); } ); + &Forker('W3Search', sub { &W3Search::W3Search($1,$2); } ); - $cmdstats{'WWWSearch'}++; + $cmdstats{'W3Search'}++; return; } - # text counters. - # warn: lets process it anyway. - if (1 and $_ = &getChanConf("ircTextCounters")) { - s/([^\w\s])/\\$1/g; - my $z = join '|', split ' '; - - if ($message =~ /^($z)stats(\s+(\S+))?$/i) { - my $type = $1; - my $arg = $3; - - if (!defined $arg or $arg =~ /^\s*$/) { - # this is way fucking ugly. - my $x = (&dbRawReturn("SELECT SUM(counter) FROM stats WHERE type=".&dbQuote($type) ))[0]; - my %hash = &dbGetCol("stats", "nick,counter", "type=".&dbQuote($type). - " ORDER BY counter DESC LIMIT 3", 1); - my $i; - my @top; - - # unfortunately we have to sort it again! - # todo: make dbGetCol return hash and array? too much effort. - my $tp = 0; - foreach $i (sort { $b <=> $a } keys %hash) { - foreach (keys %{ $hash{$i} }) { - my $p = sprintf("%.01f", 100*$i/$x); - $tp += $p; - push(@top, "\002$_\002 -- $i ($p%)"); - } - } - my $topstr = ""; - &DEBUG("tp => $tp"); - if (scalar @top) { - $topstr = ". Top ".scalar(@top).": ".join(', ', @top); - } - - if (defined $x) { - &pSReply("total count of '$type': $x$topstr"); - } else { - &pSReply("zero counter for '$type'."); - } - } else { - my $x = (&dbRawReturn("SELECT SUM(counter) FROM stats WHERE type=". - &dbQuote($type)." AND nick=".&dbQuote($arg) ))[0]; - - if (defined $x) { # defined. - &pSReply("$arg has said $type $x times"); - } else { # !defined. - &pSReply("$arg has not said $type yet."); - } - } - - return; - } - - if ($@) { - &DEBUG("regex failed: $@"); - return; - } - } + # text counters. (eg: hehstats) + my $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 (&IsChanConfOrWarn('Search')); my $thiscmd = lc $1; my $args = $3 || ""; $thiscmd =~ s/^vals$/values/; -# $args =~ s/\s+$//g; - 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 == 1) { - &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; @@ -367,11 +362,11 @@ sub Modules { # Nickometer. Adam Spiers++ if ($message =~ /^(?:lame|nick)ometer(?: for)? (\S+)/i) { - return unless (&hasParam("nickometer")); + return unless (&IsChanConfOrWarn("nickometer")); my $term = (lc $1 eq 'me') ? $who : $1; - &loadMyModule($myModules{'nickometer'}); + &loadMyModule('nickometer'); if ($term =~ /^$mask{chan}$/) { &status("Doing nickometer for chan $term."); @@ -402,7 +397,7 @@ sub Modules { push(@list, "$str ($_%)"); } - &pSReply( &formListReply(0, "Nickometer list for $term ", @list) ); + &performStrictReply( &formListReply(0, "Nickometer list for $term ", @list) ); &DEBUG("test."); return; @@ -414,7 +409,7 @@ sub Modules { $percentage = "off the scale"; } else { $percentage = sprintf("%0.4f", $percentage); - $percentage =~ s/\.?0+$//; + $percentage =~ s/(\.\d+)0+$/$1/; $percentage .= '%'; } @@ -430,7 +425,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 (&IsChanConfOrWarn('Topic')); my $chan = $talkchannel; my @args = split / /, $2 || ""; @@ -469,7 +464,7 @@ sub Modules { } # now lets do it. - &loadMyModule($myModules{'topic'}); + &loadMyModule('Topic'); &Topic($chan, $thiscmd, join(' ', @args)); $cmdstats{'Topic'}++; return; @@ -477,7 +472,7 @@ sub Modules { # wingate. if ($message =~ /^wingate$/i) { - return unless (&hasParam("wingate")); + return unless (&IsChanConfOrWarn('Wingate')); my $reply = "Wingate statistics: scanned \002" .scalar(keys %wingate)."\002 hosts"; @@ -496,19 +491,6 @@ sub Modules { return "CONTINUE"; } -# Freshmeat. xk++ -sub freshmeat { - my ($query) = @_; - - if (!defined $query) { - &help("freshmeat"); - &msg($who, "I have \002".&countKeys("freshmeat")."\002 entries."); - return; - } - - &Freshmeat::Freshmeat($query); -} - # Uptime. xk++ sub uptime { my $count = 1; @@ -527,7 +509,8 @@ sub uptime { # seen. sub seen { - my($person) = @_; + my($person) = lc shift; + $person =~ s/\?*$//; if (!defined $person or $person =~ /^$/) { &help("seen"); @@ -540,16 +523,15 @@ sub seen { } my @seen; - $person =~ s/\?*$//; &seenFlush(); # very evil hack. oh well, better safe than sorry. - ### TODO: Support &dbGetColInfo(); like in &FactInfo(); + # TODO: convert to &sqlSelectRowHash(); my $select = "nick,time,channel,host,message"; if ($person eq "random") { @seen = &randKey("seen", $select); } else { - @seen = &dbGet("seen", $select, "nick=".&dbQuote($person) ); + @seen = &sqlSelect("seen", $select, { nick => $person } ); } if (scalar @seen < 2) { @@ -564,6 +546,7 @@ sub seen { my $reply; ### 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"; @@ -574,7 +557,7 @@ sub seen { $reply .= " (".&Time2String(time() - $userstats{lc $seen[0]}{'Join'}).")"; } - if (&IsParam("seenStats")) { + 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); @@ -588,7 +571,7 @@ sub seen { "saying\002:\002 '$seen[4]'."; } - &pSReply($reply); + &performStrictReply($reply); return; } @@ -599,7 +582,7 @@ sub userinfo { if ($arg =~ /^set(\s+(.*))?$/i) { $arg = $2; if (!defined $arg) { - &help("userinfo set"); + &help('userinfo set'); return; } @@ -607,11 +590,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); } @@ -630,8 +613,8 @@ sub cookie { ### TODO: convert this to a Forker function! if ($arg) { my @list = &searchTable("factoids", "factoid_key", "factoid_value", $arg); - $key = &getRandom(@list); - $val = &getFactInfo("factoids", $key, "factoid_value"); + $key = &getRandom(@list); + $value = &getFactInfo($key, "factoid_value"); } else { ($key,$value) = &randKey("factoids","factoid_key,factoid_value"); } @@ -672,8 +655,9 @@ sub convert { sub lart { my ($target) = &fixString($_[0]); - my $extra = 0; + my $extra = 0; my $chan = $talkchannel; + my ($for); if ($msgType eq 'private') { if ($target =~ /^($mask{chan})\s+(.*)$/) { @@ -686,14 +670,19 @@ sub lart { return; } } + if ($target =~ /^(.*)(\s+for\s+.*)$/) { + $target = $1; + $for = $2; + } - my $line = &getRandomLineFromFile($bot_misc_dir. "/blootbot.lart"); + my $line = &getRandomLineFromFile($bot_data_dir. "/blootbot.lart"); if (defined $line) { if ($target =~ /^(me|you|itself|\Q$ident\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); @@ -703,7 +692,7 @@ sub lart { } sub DebianNew { - my $idx = "debian/Packages-woody.idx"; + my $idx = "debian/Packages-sid.idx"; my $error = 0; my %pkg; my @new; @@ -712,7 +701,7 @@ sub DebianNew { $error++ unless ( -e "$idx-old"); if ($error) { - $error = "no woody/woody-old index file found."; + $error = "no sid/sid-old index file found."; &ERROR("Debian: $error"); &msg($who, $error); return; @@ -735,7 +724,7 @@ sub DebianNew { next if (/^\*/); next if (exists $pkg{$_}); - push(@new); + push(@new, $_); } close IDX1; @@ -760,12 +749,24 @@ sub do_verstats { return; } - &msg($who, "Sending CTCP VERSION..."); + &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}; @@ -783,7 +784,7 @@ sub do_verstats { my $unknown = $total - $vtotal; my $perc = sprintf("%.1f", $unknown * 100 / $total); $perc =~ s/.0$//; - $sorted{$perc}{"unknown/cloak"} = "$unknown ($perc%)"; + $sorted{$perc}{"unknown/cloak"} = "$unknown ($perc%)" if ($unknown); foreach (keys %ver) { my $count = scalar keys %{ $ver{$_} }; @@ -802,7 +803,9 @@ sub do_verstats { } } - &pSReply( &formListReply(0, "IRC Client versions for $c ", @list) ); + # 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; @@ -812,7 +815,223 @@ sub do_verstats { return; } -sub nullski { my ($arg) = @_; return unless (defined $arg); - foreach (`$arg`) { &msg($who,$_); } } +sub verstats_flush { + for (1..5) { + last unless (scalar @vernicktodo); + + my $n = shift(@vernicktodo); + $conn->ctcp("VERSION", $n); + } + + return unless (scalar @vernicktodo); + + $conn->schedule(3, \&verstats_flush() ); +} + +sub do_text_counters { + my ($itc) = @_; + $itc =~ s/([^\w\s])/\\$1/g; + my $z = join '|', split ' ', $itc; + + 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 fucking 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 $c } : ""; + my $sum = &sqlSelect("stats", "SUM(counter)", $where_href); + + if (!defined $arg or $arg =~ /^\s*$/) { + # this is way fucking 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) + ); + # this is totally fucked... needs to be fixed... and cleaned up. + my $total; + my $good; + my $ii; + my $x; + + foreach (keys %hash) { + &DEBUG("_stats: hash{$_} => $hash{$_}"); + # ranking. + # TODO: convert $where to hash + my @array = &sqlSelect("stats", "nick", undef, + $where." ORDER BY counter", 1); + $good = 0; + $ii = 0; + for(my $i=0; $i $i, good => $good, total => $total"); + $x .= " ".$total."blah blah"; + } + +# return; + + if (!defined $x) { # !defined. + &performStrictReply("$arg has not said $type yet."); + return; + } + + 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 %)"; + } + + 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,$_); } +} 1;