X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FCommandStubs.pl;h=00e1ebab8a99aa879832cb1f75762d6e7ed919d3;hb=13e52da10d9264c5ccdd272cb37203736b38d491;hp=c9a19f039ccdc553ab364ddc7d895f8fa555b5ab;hpb=d801b40749049f6833deb3b5d30188ce7b61a1b5;p=infobot.git diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl index c9a19f0..00e1eba 100644 --- a/src/CommandStubs.pl +++ b/src/CommandStubs.pl @@ -1,16 +1,22 @@ # # User Command Extension Stubs +# WARN: this file does not reload on HUP. # -if (&IsParam("useStrict")) { use strict; } +#use strict; # TODO: sub { \&{ $hash{'CODEREF'} }($flatarg) }; -$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 + %cmdhooks %lang %ver); +# TODO: FIX THE FOLLOWING: +use vars qw($total $x $type $i $good %wingateToDo); ### COMMAND HOOK IMPLEMENTATION. -# addCmdHook("SECTION", 'TEXT_HOOK', -# (CODEREF => 'Blah', +# addCmdHook('TEXT_HOOK', +# (CODEREF => 'Blah', # Forker => 1, -# CheckModule => 1, # ??? # Module => 'blah.pl' # preload module. # Identifier => 'config_label', # change to Config? # Help => 'help_label', @@ -19,35 +25,42 @@ $babel_lang_regex = "fr|sp|po|pt|it|ge|de|gr|en"; ### sub addCmdHook { - my ($hashname, $ident, %hash) = @_; + my ($ident, %hash) = @_; - if (exists ${"hooks_$hashname"}{$ident}) { -### &WARN("aCH: cmd hooks \%$hashname{$ident} already exists."); + if (exists $cmdhooks{$ident}) { + &WARN("aCH: \$cmdhooks{$ident} already exists."); return; } &VERB("aCH: added $ident",2); # use $hash{'Identifier'}? ### hrm... prevent warnings? - ${"hooks_$hashname"}{$ident} = \%hash; + $cmdhooks{$ident} = \%hash; } # RUN IF ADDRESSED. sub parseCmdHook { - my ($hashname, $line) = @_; - $line =~ /^(\S+)( (.*))?$/; - my @args = split(' ', $3 || ''); - my $flatarg = $3; + my ($line) = @_; + $line =~ s/^\s+|\s+$//g; # again. + $line =~ /^(\S+)(\s+(.*))?$/; my $cmd = $1; # command name is whitespaceless. + my $flatarg = $3; + my @args = split(/\s+/, $flatarg || ''); my $done = 0; &shmFlush(); - if (!defined %{"hooks_$hashname"}) { - &WARN("cmd hooks \%$hashname does not exist."); + if (!defined %cmdhooks) { + &WARN('%cmdhooks does not exist.'); + return 0; + } + + if (!defined $cmd) { + &WARN('cstubs: cmd == NULL.'); return 0; } - foreach (keys %{"hooks_$hashname"}) { + foreach (keys %cmdhooks) { + # rename to something else! like $id or $label? my $ident = $_; next unless ($cmd =~ /^$ident$/i); @@ -57,14 +70,19 @@ sub parseCmdHook { next; } - &DEBUG("pCH(hooks_$hashname): $cmd matched $ident"); - my %hash = %{ ${"hooks_$hashname"}{$ident} }; + &status("cmdhooks: $cmd matched '$ident' '$flatarg'"); + my %hash = %{ $cmdhooks{$ident} }; if (!scalar keys %hash) { - &WARN("CmdHook: hash is NULL?"); + &WARN('CmdHook: hash is NULL?'); return 1; } + if ($hash{NoArgs} and $flatarg) { + &DEBUG("cmd $ident does not take args ('$flatarg'); skipping."); + next; + } + if (!exists $hash{CODEREF}) { &ERROR("CODEREF undefined for $cmd or $ident."); return 1; @@ -72,7 +90,7 @@ sub parseCmdHook { ### DEBUG. foreach (keys %hash) { - &DEBUG(" $cmd->$_ => '$hash{$_}'."); + &VERB(" $cmd->$_ => '$hash{$_}'.",2); } ### HELP. @@ -83,7 +101,7 @@ sub parseCmdHook { ### IDENTIFIER. if (exists $hash{'Identifier'}) { - return 1 unless (&hasParam($hash{'Identifier'})); + return 1 unless (&IsChanConfOrWarn($hash{'Identifier'})); } ### USER FLAGS. @@ -92,24 +110,32 @@ sub parseCmdHook { } ### FORKER,IDENTIFIER,CODEREF. - if (exists $hash{'Forker'}) { - $hash{'Identifier'} .= "-" if ($hash{'Forker'} eq "NULL"); - - ### FLAT_ARG / ARRAY option. + if (($$ == $bot_pid) && exists $hash{'Forker'}) { + if (exists $hash{'ArrayArgs'}) { + &Forker($hash{'Identifier'}, sub { \&{ $hash{'CODEREF'} }(@args) } ); + } else { + &Forker($hash{'Identifier'}, sub { \&{ $hash{'CODEREF'} }($flatarg) } ); + } - &Forker($hash{'Identifier'}, sub { \&{$hash{'CODEREF'}}(@args) } ); } else { if (exists $hash{'Module'}) { - &loadMyModule($myModules{ $hash{'Module'} }); + &loadMyModule($hash{'Module'}); } - ### TODO: check if CODEREF exists. + # check if CODEREF exists. + if (!defined &{ $hash{'CODEREF'} }) { + &WARN("coderef $hash{'CODEREF'} does not exist."); + if (defined $who) { + &msg($who, "coderef does not exist for $ident."); + } - if (exists $hash{'FlatArg'} and $hash{'FlatArg'} == 0) { - &status("CmdHook: using args as array."); - &{$hash{'CODEREF'}}(@args); + return 1; + } + + if (exists $hash{'ArrayArgs'}) { + &{ $hash{'CODEREF'} }(@args); } else { - &{$hash{'CODEREF'}}($flatarg); + &{ $hash{'CODEREF'} }($flatarg); } } @@ -118,7 +144,7 @@ sub parseCmdHook { $cmdstats{ $hash{'Cmdstats'} }++; } - &DEBUG("pCH: ended."); + &VERB('hooks: End of command.',2); $done = 1; } @@ -127,225 +153,86 @@ sub parseCmdHook { return 0; } -### -### START ADDING HOOKS. -### -&addCmdHook("extra", 'd?bugs', ('CODEREF' => 'debianBugs', - 'Forker' => 1, 'Identifier' => 'debianExtra', - 'Cmdstats' => 'Debian Bugs') ); -&addCmdHook("extra", 'dauthor', ('CODEREF' => 'Debian::searchAuthor', - 'Forker' => 1, 'Identifier' => 'debian', - 'Cmdstats' => 'Debian Author Search', 'Help' => "dauthor" ) ); -&addCmdHook("extra", '(d|search)desc', ('CODEREF' => 'Debian::searchDesc', - 'Forker' => 1, 'Identifier' => 'debian', - 'Cmdstats' => 'Debian Desc Search', 'Help' => "ddesc" ) ); -&addCmdHook("extra", 'dnew', ('CODEREF' => 'DebianNew', - 'Identifier' => 'debian' ) ); -&addCmdHook("extra", 'dincoming', ('CODEREF' => 'Debian::generateIncoming', - 'Forker' => 1, 'Identifier' => 'debian' ) ); -&addCmdHook("extra", 'dstats', ('CODEREF' => 'Debian::infoStats', - 'Forker' => 1, 'Identifier' => 'debian', - 'Cmdstats' => 'Debian Statistics' ) ); -&addCmdHook("extra", 'd?contents', ('CODEREF' => 'Debian::searchContents', - 'Forker' => 1, 'Identifier' => 'debian', - 'Cmdstats' => 'Debian Contents Search', 'Help' => "contents" ) ); -&addCmdHook("extra", 'd?find', ('CODEREF' => 'Debian::DebianFind', - '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', - 'Cmdstats' => 'Kernel') ); -&addCmdHook("extra", 'listauth', ('CODEREF' => 'CmdListAuth', - 'Identifier' => 'search', Module => 'factoids', - 'Help' => 'listauth') ); -&addCmdHook("extra", 'quote', ('CODEREF' => 'Quote::Quote', - 'Forker' => 1, 'Identifier' => 'quote', - 'Help' => 'quote', 'Cmdstats' => 'Quote') ); -&addCmdHook("extra", 'countdown', ('CODEREF' => 'Countdown', - 'Module' => 'countdown', 'Identifier' => 'countdown', - 'Cmdstats' => 'Countdown') ); -&addCmdHook("extra", 'lart', ('CODEREF' => 'lart', - 'Identifier' => 'lart', 'Help' => 'lart') ); -&addCmdHook("extra", 'convert', ('CODEREF' => 'convert', - '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') ); -&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', - 'Forker' => 1, 'Cmdstats' => 'Dict') ); -&addCmdHook("extra", 'slashdot', ('CODEREF' => 'Slashdot::Slashdot', - 'Identifier' => 'slashdot', 'Forker' => 1, - 'Cmdstats' => 'Slashdot') ); -&addCmdHook("extra", 'uptime', ('CODEREF' => 'uptime', 'Identifier' => 'uptime', - 'Cmdstats' => 'Uptime') ); -&addCmdHook("extra", 'nullski', ('CODEREF' => 'nullski', ) ); - sub nullski { my ($arg) = @_; foreach (`$arg`) { &msg($who,$_); } } -&addCmdHook("extra", '(fm|freshmeat)', ('CODEREF' => 'Freshmeat::Freshmeat', - 'Identifier' => 'freshmeat', 'Cmdstats' => 'Freshmeat', - 'Forker' => 1, 'Help' => 'freshmeat') ); -&addCmdHook("extra", 'verstats', ('CODEREF' => 'do_verstats' ) ); - -### -### END OF ADDING HOOKS. -### -&status("CMD: loaded ".scalar(keys %hooks_extra)." EXTRA command hooks."); - sub Modules { if (!defined $message) { - &WARN("Modules: message is undefined. should never happen."); + &WARN('Modules: message is undefined. should never happen.'); return; } - # babel bot: Jonathan Feinberg++ - if (&IsChanConf("babelfish") and $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) { + my $debiancmd = 'conflicts?|depends?|desc|file|(?:d)?info|provides?'; + $debiancmd .= '|recommends?|suggests?|maint|maintainer'; - &Forker("babelfish", sub { &babel::babelfish(lc $1, lc $2, $3); } ); - - $cmdstats{'BabelFish'}++; - return; - } - - if (&IsChanConf("debian")) { - my $debiancmd = 'conflicts?|depends?|desc|file|info|provides?'; - $debiancmd .= '|recommends?|suggests?|maint|maintainer'; - if ($message =~ /^($debiancmd)(\s+(.*))?$/i) { - my $package = lc $3; - - if (defined $package) { - &Forker("debian", sub { &Debian::infoPackages($1, $package); } ); - } else { - &help($1); - } + if ($message =~ /^($debiancmd)(\s+(.*))?$/i) { + return unless (&IsChanConfOrWarn('Debian')); + my $package = lc $3; - return; + if (defined $package) { + &Forker('Debian', sub { &Debian::infoPackages($1, $package); } ); + } else { + &help($1); } + + return; } # google searching. Simon++ - if (&IsChanConf("wwwsearch") and $message =~ /^(?:search\s+)?(\S+)\s+for\s+['"]?(.*?)['"]?\s*\?*$/i) { - return unless (&hasParam("wwwsearch")); + my $w3search_regex = 'google'; + 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. (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+)( (.*))?$/i) { - return unless (&hasParam("search")); + if ($message =~ /^list(\S+)(\s+(.*))?$/i) { + return unless (&IsChanConfOrWarn('Search')); - my $thiscmd = lc($1); - my $args = $3; + my $thiscmd = lc $1; + my $args = $3 || ''; - $thiscmd =~ s/^vals$/values/; - return if ($thiscmd ne "keys" && $thiscmd ne "values"); + $thiscmd =~ s/^vals$/values/; + return if ($thiscmd ne 'keys' && $thiscmd ne 'values'); # Usage: - if (!defined $args) { - &help("list". $thiscmd); + if (!defined $args or $args =~ /^\s*$/) { + &help('list'. $thiscmd); return; } - if (length $args == 1) { - &msg($who,"search string is too short."); - return; + # suggested by asuffield and \broken. + if ($args =~ /^["']/ and $args =~ /["']$/) { + &DEBUG('list*: removed quotes.'); + $args =~ s/^["']|["']$//g; } - &Forker("search", sub { &Search::Search($thiscmd, $args); } ); - - $cmdstats{'Factoid Search'}++; - return; - } - - # Nickometer. Adam Spiers++ - if ($message =~ /^(?:lame|nick)ometer(?: for)? (\S+)/i) { - return unless (&hasParam("nickometer")); - - my $term = (lc $1 eq 'me') ? $who : $1; - - &loadMyModule($myModules{'nickometer'}); - - if ($term =~ /^$mask{chan}$/) { - &status("Doing nickometer for chan $term."); - - if (!&validChan($term)) { - &msg($who, "error: channel is invalid."); - return; - } - - # step 1. - my %nickometer; - foreach (keys %{ $channels{lc $term}{''} }) { - my $str = $_; - if (!defined $str) { - &WARN("nickometer: nick in chan $term undefined?"); - next; - } - - my $value = &nickometer($str); - $nickometer{$value}{$str} = 1; - } - - # step 2. - ### TODO: compact with map? - my @list; - foreach (sort {$b <=> $a} keys %nickometer) { - my $str = join(", ", sort keys %{$nickometer{$_}}); - push(@list, "$str ($_%)"); - } - - &pSReply( &formListReply(0, "Nickometer list for $term ", @list) ); - &DEBUG("test."); - + if (length $args < 2 && &IsFlag('o') ne 'o') { + &msg($who, 'search string is too short.'); return; } - my $percentage = &nickometer($term); - - if ($percentage =~ /NaN/) { - $percentage = "off the scale"; - } else { - $percentage = sprintf("%0.4f", $percentage); - $percentage =~ s/\.?0+$//; - $percentage .= '%'; - } - - if ($msgType eq 'public') { - &say("'$term' is $percentage lame, $who"); - } else { - &msg($who, "the 'lame nick-o-meter' reading for $term is $percentage, $who"); - } + &Forker('Search', sub { &Search::Search($thiscmd, $args); } ); + $cmdstats{'Factoid Search'}++; return; } # Topic management. xk++ - # may want to add a flag(??) for topic in the near future. -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); + my @args = split / /, $2 || ''; if (!scalar @args) { &msg($who,"Try 'help topic'"); @@ -357,14 +244,14 @@ sub Modules { # topic over public: if ($msgType eq 'public' && $thiscmd =~ /^#/) { - &msg($who, "error: channel argument is not required."); + &msg($who, 'error: channel argument is not required.'); &msg($who, "\002Usage\002: topic "); return; } # topic over private: if ($msgType eq 'private' && $chan !~ /^#/) { - &msg($who, "error: channel argument is required."); + &msg($who, 'error: channel argument is required.'); &msg($who, "\002Usage\002: topic #channel "); return; } @@ -381,7 +268,7 @@ sub Modules { } # now lets do it. - &loadMyModule($myModules{'topic'}); + &loadMyModule('Topic'); &Topic($chan, $thiscmd, join(' ', @args)); $cmdstats{'Topic'}++; return; @@ -389,14 +276,14 @@ 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"; + .scalar(keys %wingateToDo)."\002 hosts"; my $queue = scalar(keys %wingateToDo); if ($queue) { $reply .= ". I have \002$queue\002 hosts in the queue"; - $reply .= ". Started the scan ".&Time2String(time() - $wingaterun)." ago"; + $reply .= '. Started the scan '.&Time2String(time() - $wingaterun).' ago'; } &performStrictReply("$reply."); @@ -405,20 +292,7 @@ sub Modules { } # do nothing and let the other routines have a go - 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); + return 'CONTINUE'; } # Uptime. xk++ @@ -439,29 +313,29 @@ sub uptime { # seen. sub seen { - my($person) = @_; + my($person) = lc shift; + $person =~ s/\?*$//; - if (!defined $person) { - &help("seen"); + if (!defined $person or $person =~ /^$/) { + &help('seen'); - my $i = &countKeys("seen"); - &msg($who,"there ". &fixPlural("is",$i) ." \002$i\002 ". - "seen ". &fixPlural("entry",$i) ." that I know of."); + my $i = &countKeys('seen'); + &msg($who,'there '. &fixPlural('is',$i) ." \002$i\002 ". + 'seen '. &fixPlural('entry',$i) .' that I know of.'); return; } my @seen; - $person =~ s/\?*$//; &seenFlush(); # very evil hack. oh well, better safe than sorry. - ### TODO: Support &dbGetRowInfo(); like in &FactInfo(); - my $select = "nick,time,channel,host,message"; - if ($person eq "random") { - @seen = &randKey("seen", $select); + # TODO: convert to &sqlSelectRowHash(); + my $select = 'nick,time,channel,host,message'; + if ($person eq 'random') { + @seen = &randKey('seen', $select); } else { - @seen = &dbGet("seen", "nick", $person, $select); + @seen = &sqlSelect('seen', $select, { nick => $person } ); } if (scalar @seen < 2) { @@ -476,23 +350,25 @@ sub seen { my $reply; ### TODO: multi channel support. may require &IsNick() to return ### all channels or something. - my @chans = &GetNickInChans($seen[0]); + + my @chans = &getNickInChans($seen[0]); if (scalar @chans) { $reply = "$seen[0] is currently on"; foreach (@chans) { - $reply .= " ".$_; + $reply .= ' '.$_; next unless (exists $userstats{lc $seen[0]}{'Join'}); - $reply .= " (".&Time2String(time() - $userstats{lc $seen[0]}{'Join'}).")"; + $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); + $reply .= ". Has said a total of \002$i\002 messages" if (defined $i); $i = $userstats{lc $seen[0]}{'Time'}; - $reply .= ". Is idling for ".&Time2String(time() - $i) if (defined $i); + $reply .= '. Is idling for '.&Time2String(time() - $i) if (defined $i); } + $reply .= ", last said\002:\002 '$seen[4]'."; } else { my $howlong = &Time2String(time() - $seen[1]); $reply = "$seen[0] <$seen[3]> was last seen on IRC ". @@ -511,7 +387,7 @@ sub userinfo { if ($arg =~ /^set(\s+(.*))?$/i) { $arg = $2; if (!defined $arg) { - &help("userinfo set"); + &help('userinfo set'); return; } @@ -519,11 +395,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); } @@ -535,17 +411,17 @@ sub cookie { # lets find that secret cookie. my $target = ($msgType ne 'public') ? $who : $talkchannel; - my $cookiemsg = &getRandom(keys %{$lang{'cookie'}}); + my $cookiemsg = &getRandom(keys %{ $lang{'cookie'} }); my ($key,$value); ### WILL CHEW TONS OF MEM. ### 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"); + my @list = &searchTable('factoids', 'factoid_key', 'factoid_value', $arg); + $key = &getRandom(@list); + $value = &getFactInfo($key, 'factoid_value'); } else { - ($key,$value) = &randKey("factoids","factoid_key,factoid_value"); + ($key,$value) = &randKey('factoids','factoid_key,factoid_value'); } for ($cookiemsg) { @@ -572,8 +448,8 @@ sub convert { ($from,$to) = ($2,$1) if ($arg =~ /^(.*?) from (.*)$/i); if (!$to or !$from) { - &msg($who, "Invalid format!"); - &help("convert"); + &msg($who, 'Invalid format!'); + &help('convert'); return; } @@ -584,8 +460,10 @@ sub convert { sub lart { my ($target) = &fixString($_[0]); - my $extra = 0; + my $extra = 0; my $chan = $talkchannel; + my ($for); + my $mynick = $conn->nick(); if ($msgType eq 'private') { if ($target =~ /^($mask{chan})\s+(.*)$/) { @@ -593,29 +471,34 @@ sub lart { $target = $2; $extra = 1; } else { - &msg($who, "error: invalid format or missing arguments."); - &help("lart"); + &msg($who, 'error: invalid format or missing arguments.'); + &help('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) { + if ($target =~ /^(me|you|itself|\Q$mynick\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); } else { - &status("lart: error reading file?"); + &status('lart: error reading file?'); } } sub DebianNew { - my $idx = "debian/Packages-woody.idx"; + my $idx = 'debian/Packages-sid.idx'; my $error = 0; my %pkg; my @new; @@ -624,7 +507,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; @@ -647,18 +530,18 @@ sub DebianNew { next if (/^\*/); next if (exists $pkg{$_}); - push(@new); + push(@new, $_); } close IDX1; - &::performStrictReply( &::formListReply(0, "New debian packages:", @new) ); + &::performStrictReply( &::formListReply(0, 'New debian packages:', @new) ); } sub do_verstats { my ($chan) = @_; if (!defined $chan) { - &help("verstats"); + &help('verstats'); return; } @@ -668,20 +551,36 @@ sub do_verstats { } if (scalar @vernick > scalar(keys %{ $channels{lc $chan}{''} })/4) { - &msg($who, "verstats already in progress for someone else."); + &msg($who, 'verstats already in progress for someone else.'); return; } - &msg($who, "Sending CTCP VERSION..."); - $conn->ctcp("VERSION", $chan); -# $cache{verstats} = $chan; + &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}; - my $c = lc $chan; + my $c = lc $cache{verstats}{chan}; my $total = keys %{ $channels{$c}{''} }; -# delete $cache{verstats}; + $chan = $c; + $who = $cache{verstats}{who}; + $msgType = $cache{verstats}{msgType}; + delete $cache{verstats}; # sufficient? foreach (keys %ver) { $vtotal += scalar keys %{ $ver{$_} }; @@ -691,7 +590,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{$_} }; @@ -710,7 +609,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; @@ -720,4 +621,296 @@ sub do_verstats { return; } +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 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 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 messed up... 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 $where = ''; + 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,$_); } +} + +%cmdhooks=(); +### +### START ADDING HOOKS. +### +&addCmdHook('(babel(fish)?|x|xlate|translate)', ('CODEREF' => 'babelfish::babelfish', 'Identifier' => 'babelfish', 'Cmdstats' => 'babelfish', 'Forker' => 1, 'Help' => 'babelfish', 'Module' => 'babelfish') ); +&addCmdHook('(botmail|message)', ('CODEREF' => 'botmail::parse', 'Identifier' => 'botmail', 'Cmdstats' => 'botmail') ); +&addCmdHook('bzflist17', ('CODEREF' => 'BZFlag::list17', 'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag', 'Forker' => 1, 'Module' => 'BZFlag') ); +&addCmdHook('bzflist', ('CODEREF' => 'BZFlag::list', 'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag', 'Forker' => 1, 'Module' => 'BZFlag') ); +&addCmdHook('bzfquery', ('CODEREF' => 'BZFlag::query', 'Identifier' => 'BZFlag', 'Cmdstats' => 'BZFlag', 'Forker' => 1, 'Module' => 'BZFlag') ); +&addCmdHook('chan(stats|info)', ('CODEREF' => 'chaninfo', ) ); +&addCmdHook('cmd(stats|info)', ('CODEREF' => 'cmdstats', ) ); +&addCmdHook('convert', ('CODEREF' => 'convert', 'Forker' => 1, 'Identifier' => 'Units', 'Help' => 'convert') ); +&addCmdHook('(cookie|random)', ('CODEREF' => 'cookie', 'Forker' => 1, 'Identifier' => 'Factoids') ); +&addCmdHook('countdown', ('CODEREF' => 'countdown', 'Module' => 'countdown', 'Identifier' => 'countdown', 'Cmdstats' => 'countdown') ); +&addCmdHook('countrystats', ('CODEREF' => 'countryStats') ); +&addCmdHook('dauthor', ('CODEREF' => 'Debian::searchAuthor', 'Forker' => 1, 'Identifier' => 'Debian', 'Cmdstats' => 'Debian Author Search', 'Help' => 'dauthor' ) ); +&addCmdHook('d?bugs', ('CODEREF' => 'DebianExtra::Parse', 'Forker' => 1, 'Identifier' => 'DebianExtra', 'Cmdstats' => 'Debian Bugs') ); +&addCmdHook('d?contents', ('CODEREF' => 'Debian::searchContents', 'Forker' => 1, 'Identifier' => 'Debian', 'Cmdstats' => 'Debian Contents Search', 'Help' => 'contents' ) ); +&addCmdHook('d?find', ('CODEREF' => 'Debian::DebianFind', 'Forker' => 1, 'Identifier' => 'Debian', 'Cmdstats' => 'Debian Search', 'Help' => 'find' ) ); +&addCmdHook('dice', ('CODEREF' => 'dice::dice', 'Identifier' => 'dice', 'Cmdstats' => 'dice', 'Forker' => 1, 'Module' => 'dice') ); +&addCmdHook('Dict', ('CODEREF' => 'Dict::Dict', 'Identifier' => 'Dict', 'Help' => 'dict', 'Forker' => 1, 'Cmdstats' => 'Dict') ); +&addCmdHook('dincoming', ('CODEREF' => 'Debian::generateIncoming', 'Forker' => 1, 'Identifier' => 'Debian' ) ); +&addCmdHook('dnew', ('CODEREF' => 'DebianNew', 'Identifier' => 'Debian' ) ); +&addCmdHook('dns|d?nslookup', ('CODEREF' => 'dns::query', 'Identifier' => 'dns', 'Cmdstats' => 'dns', 'Forker' => 1, 'Help' => 'dns') ); +&addCmdHook('(d|search)desc', ('CODEREF' => 'Debian::searchDescFE', 'Forker' => 1, 'Identifier' => 'Debian', 'Cmdstats' => 'Debian Desc Search', 'Help' => 'ddesc' ) ); +&addCmdHook('dstats', ('CODEREF' => 'Debian::infoStats', 'Forker' => 1, 'Identifier' => 'Debian', 'Cmdstats' => 'Debian Statistics' ) ); +&addCmdHook('(ex)?change', ('CODEREF' => 'Exchange::query', 'Identifier' => 'Exchange', 'Cmdstats' => 'Exchange', 'Forker' => 1) ); +&addCmdHook('factinfo', ('CODEREF' => 'factinfo', 'Cmdstats' => 'Factoid Info', Module => 'Factoids', ) ); +&addCmdHook('factstats?', ('CODEREF' => 'factstats', 'Cmdstats' => 'Factoid Stats', Help => 'factstats', Forker => 1, 'Identifier' => 'Factoids', ) ); +&addCmdHook('help', ('CODEREF' => 'help', 'Cmdstats' => 'Help', ) ); +&addCmdHook('HTTPDtype', ('CODEREF' => 'HTTPDtype::HTTPDtype', 'Identifier' => 'HTTPDtype', 'Cmdstats' => 'HTTPDtype', 'Forker' => 1) ); +&addCmdHook('[ia]?spell', ('CODEREF' => 'spell::query', 'Identifier' => 'spell', 'Cmdstats' => 'spell', 'Forker' => 1, 'Help' => 'spell') ); +&addCmdHook('insult', ('CODEREF' => 'Insult::Insult', 'Forker' => 1, 'Identifier' => 'insult', 'Help' => 'insult' ) ); +&addCmdHook('karma', ('CODEREF' => 'karma', ) ); +&addCmdHook('kernel', ('CODEREF' => 'Kernel::Kernel', 'Forker' => 1, 'Identifier' => 'Kernel', 'Cmdstats' => 'Kernel', 'NoArgs' => 1) ); +&addCmdHook('lart', ('CODEREF' => 'lart', 'Identifier' => 'lart', 'Help' => 'lart') ); +&addCmdHook('lc', ('CODEREF' => 'case::lower', 'Identifier' => 'case', 'Cmdstats' => 'case', 'Forker' => 1, 'Module' => 'case') ); +&addCmdHook('listauth', ('CODEREF' => 'CmdListAuth', 'Identifier' => 'Search', Module => 'Factoids', 'Help' => 'listauth') ); +&addCmdHook('md5(sum)?', ('CODEREF' => 'md5::md5', 'Identifier' => 'md5', 'Cmdstats' => 'md5', 'Forker' => 1, 'Module' => 'md5') ); +&addCmdHook('metar', ('CODEREF' => 'Weather::Metar', 'Identifier' => 'Weather', 'Help' => 'weather', 'Cmdstats' => 'Weather', 'Forker' => 1) ); +&addCmdHook('News', ('CODEREF' => 'News::Parse', Module => 'News', 'Cmdstats' => 'News' ) ); +&addCmdHook('(?:nick|lame)ometer(?: for)?', ('CODEREF' => 'nickometer::query', 'Identifier' => 'nickometer', 'Cmdstats' => 'nickometer', 'Forker' => 1) ); +&addCmdHook('nullski', ('CODEREF' => 'nullski', ) ); +&addCmdHook('page', ('CODEREF' => 'pager::page', 'Identifier' => 'pager', 'Cmdstats' => 'pager', 'Forker' => 1, 'Help' => 'page') ); +&addCmdHook('piglatin', ('CODEREF' => 'piglatin::piglatin', 'Identifier' => 'piglatin', 'Cmdstats' => 'piglatin', 'Forker' => 1) ); +&addCmdHook('Plug', ('CODEREF' => 'Plug::Plug', 'Identifier' => 'Plug', 'Forker' => 1, 'Cmdstats' => 'Plug') ); +&addCmdHook('quote', ('CODEREF' => 'Quote::Quote', 'Forker' => 1, 'Identifier' => 'Quote', 'Help' => 'quote', 'Cmdstats' => 'Quote') ); +&addCmdHook('reverse', ('CODEREF' => 'reverse::reverse', 'Identifier' => 'reverse', 'Cmdstats' => 'reverse', 'Forker' => 1, 'Module' => 'reverse') ); +&addCmdHook('RootWarn', ('CODEREF' => 'CmdrootWarn', 'Identifier' => 'RootWarn', 'Module' => 'RootWarn') ); +&addCmdHook('OnJoin', ('CODEREF' => 'Cmdonjoin', 'Identifier' => 'OnJoin', 'Module' => 'OnJoin') ); +&addCmdHook('Rss', ('CODEREF' => 'Rss::Rss', 'Identifier' => 'Rss', 'Cmdstats' => 'Rss', 'Forker' => 1, 'Help' => 'rss') ); +&addCmdHook('sched(stats|info)', ('CODEREF' => 'scheduleList', ) ); +&addCmdHook('scramble', ('CODEREF' => 'scramble::scramble', 'Identifier' => 'scramble', 'Cmdstats' => 'scramble', 'Forker' => 1, 'Module' => 'scramble') ); +&addCmdHook('seen', ('CODEREF' => 'seen', 'Identifier' => 'seen') ); +&addCmdHook('slashdot', ('CODEREF' => 'Slashdot::Slashdot', 'Identifier' => 'slashdot', 'Forker' => 1, 'Cmdstats' => 'slashdot') ); +&addCmdHook('tell|explain', ('CODEREF' => 'tell', Help => 'tell', Identifier => 'allowTelling', Cmdstats => 'Tell') ); +&addCmdHook('uc', ('CODEREF' => 'case::upper', 'Identifier' => 'case', 'Cmdstats' => 'case', 'Forker' => 1, 'Module' => 'case') ); +&addCmdHook('Uptime', ('CODEREF' => 'uptime', 'Identifier' => 'Uptime', 'Cmdstats' => 'Uptime') ); +&addCmdHook('u(ser)?info', ('CODEREF' => 'userinfo', 'Identifier' => 'UserInfo', 'Help' => 'userinfo', 'Module' => 'UserInfo') ); +&addCmdHook('verstats', ('CODEREF' => 'do_verstats' ) ); +&addCmdHook('Weather', ('CODEREF' => 'Weather::Weather', 'Identifier' => 'Weather', 'Help' => 'weather', 'Cmdstats' => 'Weather', 'Forker' => 1, 'Module' => 'Weather') ); +&addCmdHook('wiki(pedia)?', ('CODEREF' => 'wikipedia::wikipedia', 'Identifier' => 'wikipedia', 'Cmdstats' => 'wikipedia', 'Forker' => 1, 'Help' => 'wikipedia', 'Module' => 'wikipedia') ); +&addCmdHook('wtf', ('CODEREF' => 'wtf::query', 'Identifier' => 'wtf', 'Cmdstats' => 'wtf', 'Forker' => 1, 'Help' => 'wtf', 'Module' => 'wtf') ); +&addCmdHook('zfi', ('CODEREF' => 'zfi::query', 'Identifier' => 'zfi', 'Cmdstats' => 'zfi', 'Forker' => 1, 'Module' => 'zfi') ); +&addCmdHook('(zippy|yow)', ('CODEREF' => 'zippy::get', 'Identifier' => 'Zippy', 'Cmdstats' => 'Zippy', 'Forker' => 1, 'Module' => 'Zippy') ); +&addCmdHook('zsi', ('CODEREF' => 'zsi::query', 'Identifier' => 'zsi', 'Cmdstats' => 'zsi', 'Forker' => 1, 'Module' => 'zsi') ); +### +### END OF ADDING HOOKS. +### + +&status('loaded '.scalar(keys %cmdhooks).' command hooks.'); + 1;