#
# User Command Extension Stubs
+# WARN: this file does not reload on HUP.
#
-if (&IsParam("useStrict")) { use strict; }
+#use strict;
$babel_lang_regex = "fr|sp|po|pt|it|ge|de|gr|en";
sub parseCmdHook {
my ($hashname, $line) = @_;
$line =~ /^(\S+)( (.*))?$/;
- my @args = split(' ', $3 || '');
- my $flatarg = $3;
my $cmd = $1; # command name is whitespaceless.
+ my $flatarg = $3;
+ my @args = split(/\s+/, $flatarg || '');
my $done = 0;
&shmFlush();
return 0;
}
+ if (!defined $cmd) {
+ &WARN("cstubs: cmd == NULL.");
+ return 0;
+ }
+
foreach (keys %{"hooks_$hashname"}) {
+ # rename to something else! like $id or $label?
my $ident = $_;
next unless ($cmd =~ /^$ident$/i);
next;
}
- &DEBUG("pCH(hooks_$hashname): $cmd matched $ident");
+ &status("hooks($hashname): $cmd matched '$ident'");
my %hash = %{ ${"hooks_$hashname"}{$ident} };
if (!scalar keys %hash) {
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;
### DEBUG.
foreach (keys %hash) {
- &DEBUG(" $cmd->$_ => '$hash{$_}'.");
+ &VERB(" $cmd->$_ => '$hash{$_}'.",2);
}
### HELP.
if (exists $hash{'Forker'}) {
$hash{'Identifier'} .= "-" if ($hash{'Forker'} eq "NULL");
- ### FLAT_ARG / ARRAY option.
+ 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'} });
}
- ### TODO: check if CODEREF exists.
+ # check if CODEREF exists.
+ if (!defined &{ $hash{'CODEREF'} }) {
+ &WARN("coderef $hash{'CODEREF'} don't exist.");
+ if (defined $who) {
+ &msg($who, "coderef does not exist for $ident.");
+ }
+
+ return 1;
+ }
- if (exists $hash{'FlatArg'} and $hash{'FlatArg'} == 0) {
- &status("CmdHook: using args as array.");
- &{$hash{'CODEREF'}}(@args);
+ if (exists $hash{'ArrayArgs'}) {
+ &{ $hash{'CODEREF'} }(@args);
} else {
- &{$hash{'CODEREF'}}($flatarg);
+ &{ $hash{'CODEREF'} }($flatarg);
}
}
$cmdstats{ $hash{'Cmdstats'} }++;
}
- &DEBUG("pCH: ended.");
+ &VERB("hooks: End of command.",2);
$done = 1;
}
###
### START ADDING HOOKS.
###
-&addCmdHook("extra", 'd?bugs', ('CODEREF' => 'debianBugs',
+&addCmdHook("extra", 'd?bugs', ('CODEREF' => 'DBugs::Parse',
'Forker' => 1, 'Identifier' => 'debianExtra',
'Cmdstats' => 'Debian Bugs') );
&addCmdHook("extra", 'dauthor', ('CODEREF' => 'Debian::searchAuthor',
'Forker' => 1, 'Identifier' => 'insult', 'Help' => "insult" ) );
&addCmdHook("extra", 'kernel', ('CODEREF' => 'Kernel::Kernel',
'Forker' => 1, 'Identifier' => 'kernel',
- 'Cmdstats' => 'Kernel') );
+ 'Cmdstats' => 'Kernel', 'NoArgs' => 1) );
&addCmdHook("extra", 'listauth', ('CODEREF' => 'CmdListAuth',
'Identifier' => 'search', Module => 'factoids',
'Help' => 'listauth') );
&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' ) );
+&addCmdHook("extra", 'weather', ('CODEREF' => 'Weather::Weather',
+ 'Identifier' => 'weather', 'Help' => 'weather',
+ 'Cmdstats' => 'Weather') );
###
### END OF ADDING HOOKS.
}
# babel bot: Jonathan Feinberg++
- if (&IsChanConf("babelfish") and $message =~ m{
+ if ($message =~ m{
^\s*
(?:babel(?:fish)?|x|xlate|translate)
\s+
($babel_lang_regex)\w* # which language?
\s*
(.+) # The phrase to be translated
- }xoi) {
+ }xoi) {
+ return unless (&hasParam("babelfish"));
&Forker("babelfish", sub { &babel::babelfish(lc $1, lc $2, $3); } );
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;
+ my $debiancmd = 'conflicts?|depends?|desc|file|info|provides?';
+ $debiancmd .= '|recommends?|suggests?|maint|maintainer';
- if (defined $package) {
- &Forker("debian", sub { &Debian::infoPackages($1, $package); } );
- } else {
- &help($1);
- }
+ if ($message =~ /^($debiancmd)(\s+(.*))?$/i) {
+ return unless (&hasParam("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) {
+ if ($message =~ /^(?:search\s+)?(\S+)\s+for\s+['"]?(.*?)["']?\s*\?*$/i) {
return unless (&hasParam("wwwsearch"));
&Forker("wwwsearch", sub { &W3Search::W3Search($1,$2); } );
return;
}
+ # text counters. (eg: hehstats)
+ my $itc;
+ $itc = &getChanConf("ircTextCounters");
+ $itc = &findChanConf("ircTextCounters") unless ($itc);
+ if ($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;
+ }
+
+ if ($message =~ /^($z)stats(\s+(\S+))?$/i) {
+ my $type = $1;
+ my $arg = $3;
+
+ # even more uglier with channel/time arguments.
+ my $c = $chan;
+# my $c = $chan || "PRIVATE";
+ my $where = "type=".&dbQuote($type);
+ $where .= " AND channel=".&dbQuote($c) if (defined $c);
+ &DEBUG("not using chan arg") if (!defined $c);
+ my $sum = (&dbRawReturn("SELECT SUM(counter) FROM stats"
+ ." WHERE ".$where ))[0];
+
+ if (!defined $arg or $arg =~ /^\s*$/) {
+ # this is way fucking ugly.
+
+ my %hash = &dbGetCol("stats", "nick,counter",
+ $where." 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/$sum);
+ $tp += $p;
+ push(@top, "\002$_\002 -- $i ($p%)");
+ }
+ }
+ my $topstr = "";
+ &DEBUG("*stats: tp => $tp");
+ if (scalar @top) {
+ $topstr = ". Top ".scalar(@top).": ".join(', ', @top);
+ }
+
+ if (defined $sum) {
+ &pSReply("total count of \037$type\037 on \002$c\002: $sum$topstr");
+ } else {
+ &pSReply("zero counter for \037$type\037.");
+ }
+ } else {
+ my $x = (&dbRawReturn("SELECT SUM(counter) FROM stats".
+ " WHERE $where AND nick=".&dbQuote($arg) ))[0];
+
+ if (!defined $x) { # !defined.
+ &pSReply("$arg has not said $type yet.");
+ return;
+ }
+
+ # defined.
+ my @array = &dbGet("stats", "nick",
+ $where." ORDER BY counter", 1);
+ my $good = 0;
+ my $i = 0;
+ for($i=0; $i<scalar @array; $i++) {
+ next unless ($array[0] =~ /^\Q$who\E$/);
+ $good++;
+ last;
+ }
+ $i++;
+
+ my $total = scalar(@array);
+ my $xtra = "";
+ if ($total and $good) {
+ my $pct = sprintf("%.01f", 100*(1+$total-$i)/$total);
+ $xtra = ", ranked $i\002/\002$total (percentile: \002$pct\002 %)";
+ }
+
+ my $pct1 = sprintf("%.01f", 100*$x/$sum);
+ &pSReply("\002$arg\002 has said \037$type\037 \002$x\002 times (\002$pct1\002 %)$xtra");
+ }
+
+ return;
+ }
+
+ if ($@) {
+ &DEBUG("regex failed: $@");
+ return;
+ }
+ }
+
# list{keys|values}. xk++. Idea taken from #linuxwarez@EFNET
- if ($message =~ /^list(\S+)( (.*))?$/i) {
+ if ($message =~ /^list(\S+)(\s+(.*))?$/i) {
return unless (&hasParam("search"));
- my $thiscmd = lc($1);
- my $args = $3;
+ my $thiscmd = lc $1;
+ my $args = $3 || "";
- $thiscmd =~ s/^vals$/values/;
+ $thiscmd =~ s/^vals$/values/;
+# $args =~ s/\s+$//g;
return if ($thiscmd ne "keys" && $thiscmd ne "values");
# Usage:
- if (!defined $args) {
+ if (!defined $args or $args =~ /^\s*$/) {
&help("list". $thiscmd);
return;
}
+ # suggested by asuffield and \broken.
+ if ($args =~ /^["']/ and $args =~ /["']$/) {
+ &DEBUG("list*: removed quotes.");
+ $args =~ s/^["']|["']$//g;
+ }
+
if (length $args == 1) {
&msg($who,"search string is too short.");
return;
### TODO: compact with map?
my @list;
foreach (sort {$b <=> $a} keys %nickometer) {
- my $str = join(", ", sort keys %{$nickometer{$_}});
+ my $str = join(", ", sort keys %{ $nickometer{$_} });
push(@list, "$str ($_%)");
}
}
# 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"));
my $chan = $talkchannel;
- my @args = split(/ /, $2);
+ my @args = split / /, $2 || "";
if (!scalar @args) {
&msg($who,"Try 'help topic'");
$reply .= ". Started the scan ".&Time2String(time() - $wingaterun)." ago";
}
- &performStrictReply("$reply.");
+ &pSReply("$reply.");
return;
}
# seen.
sub seen {
- my($person) = @_;
+ my($person) = lc shift;
+ $person =~ s/\?*$//;
- if (!defined $person) {
+ if (!defined $person or $person =~ /^$/) {
&help("seen");
my $i = &countKeys("seen");
}
my @seen;
- $person =~ s/\?*$//;
&seenFlush(); # very evil hack. oh well, better safe than sorry.
- ### TODO: Support &dbGetRowInfo(); like in &FactInfo();
+ ### TODO: Support &dbGetColInfo(); like in &FactInfo();
my $select = "nick,time,channel,host,message";
if ($person eq "random") {
@seen = &randKey("seen", $select);
} else {
- @seen = &dbGet("seen", "nick", $person, $select);
+ @seen = &dbGet("seen", $select, "nick=".&dbQuote($person) );
}
if (scalar @seen < 2) {
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";
"saying\002:\002 '$seen[4]'.";
}
- &performStrictReply($reply);
+ &pSReply($reply);
return;
}
# 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.
}
}
- 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;
}
close IDX1;
- &::performStrictReply( &::formListReply(0, "New debian packages:", @new) );
+ &::pSReply( &::formListReply(0, "New debian packages:", @new) );
}
sub do_verstats {
return;
}
- &msg($who, "Sending CTCP VERSION...");
+ &msg($who, "Sending CTCP VERSION to #$chan...");
$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};
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{$_} };
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 textstats_main {
+ my($arg) = @_;
+
+ # even more uglier with channel/time arguments.
+ my $c = $chan;
+# my $c = $chan || "PRIVATE";
+ my $where = "channel=".&dbQuote($c) if (defined $c);
+ &DEBUG("not using chan arg") if (!defined $c);
+ my $sum = (&dbRawReturn("SELECT SUM(counter) FROM stats"
+ ." WHERE ".$where ))[0];
+
+ if (!defined $arg or $arg =~ /^\s*$/) {
+ # this is way fucking ugly.
+ &DEBUG("_stats: !arg");
+
+ my %hash = &dbGetCol("stats", "nick,counter",
+ $where." 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/$sum);
+ $tp += $p;
+ push(@top, "\002$_\002 -- $i ($p%)");
+ }
+ }
+
+ my $topstr = "";
+ &DEBUG("*stats: tp => $tp");
+ if (scalar @top) {
+ $topstr = ". Top ".scalar(@top).": ".join(', ', @top);
+ }
+
+ if (defined $sum) {
+ &pSReply("total count of \037$type\037 on \002$c\002: $sum$topstr");
+ } else {
+ &pSReply("zero counter for \037$type\037.");
+ }
+ } else {
+ my %hash = &dbGetCol("stats", "type,counter",
+ "$where AND nick=".&dbQuote($arg) );
+
+ foreach (keys %hash) {
+ &DEBUG("_stats: hash{$_} => $hash{$_}");
+ # ranking.
+ my @array = &dbGet("stats", "nick",
+ $where." ORDER BY counter", 1);
+ my $good = 0;
+ my $i = 0;
+ for($i=0; $i<scalar @array; $i++) {
+ next unless ($array[0] =~ /^\Q$who\E$/);
+ $good++;
+ last;
+ }
+ $i++;
+
+ my $total = scalar(@array);
+ &DEBUG(" i => $i, good => $good, total => $total");
+ }
+
+ return;
+
+ if (!defined $x) { # !defined.
+ &pSReply("$arg has not said $type yet.");
+ return;
+ }
+
+ my $xtra = "";
+ if ($total and $good) {
+ my $pct = sprintf("%.01f", 100*(1+$total-$i)/$total);
+ $xtra = ", ranked $i\002/\002$total (percentile: \002$pct\002 %)";
+ }
+
+ my $pct1 = sprintf("%.01f", 100*$x/$sum);
+ &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,$_); } }
+
1;