# WARN: this file does not reload on HUP.
#
-#use strict;
+# use strict; # TODO
+
+use vars qw($who $msgType $conn $chan $message $ident $talkchannel
+ $bot_version $babel_lang_regex $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',
&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',
&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') );
###
### END OF ADDING HOOKS.
}
# google searching. Simon++
- if ($message =~ /^(?:search\s+)?(\S+)\s+for\s+['"]?(.*?)["']?\s*\?*$/i) {
+ if ($message =~ /^(?:search\s+)?($w3search_regex)\s+for\s+['"]?(.*?)["']?\s*\?*$/i) {
return unless (&hasParam("wwwsearch"));
&Forker("wwwsearch", sub { &W3Search::W3Search($1,$2); } );
# 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);
+ my $where = "type=".&sqlQuote($type);
+ $where .= " AND channel=".&sqlQuote($c) if (defined $c);
&DEBUG("not using chan arg") if (!defined $c);
- my $sum = (&dbRawReturn("SELECT SUM(counter) FROM stats"
+ my $sum = (&sqlRawReturn("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);
+ # 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!
- # todo: make dbGetCol return hash and array? too much effort.
my $tp = 0;
foreach $i (sort { $b <=> $a } keys %hash) {
foreach (keys %{ $hash{$i} }) {
&pSReply("zero counter for \037$type\037.");
}
} else {
- my $x = (&dbRawReturn("SELECT SUM(counter) FROM stats".
- " WHERE $where AND nick=".&dbQuote($arg) ))[0];
+ # 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.
&pSReply("$arg has not said $type yet.");
}
# defined.
- my @array = &dbGet("stats", "nick",
- $where." ORDER BY counter", 1);
+ # 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<scalar @array; $i++) {
my $args = $3 || "";
$thiscmd =~ s/^vals$/values/;
-# $args =~ s/\s+$//g;
return if ($thiscmd ne "keys" && $thiscmd ne "values");
# Usage:
$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;
}
$percentage = "off the scale";
} else {
$percentage = sprintf("%0.4f", $percentage);
- $percentage =~ s/\.?0+$//;
+ $percentage =~ s/(\.\d+)0+$/$1/;
$percentage .= '%';
}
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;
my($person) = lc shift;
$person =~ s/\?*$//;
- if (&whatInterface() !~ /IRC/) {
- &status("seen disabled in CLI.");
- return;
- }
-
if (!defined $person or $person =~ /^$/) {
&help("seen");
&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) {
### 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");
}
return;
}
- &msg($who, "Sending CTCP VERSION to #$chan...");
+ &msg($who, "Sending CTCP VERSION to $chan; results in 60s.");
$conn->ctcp("VERSION", $chan);
$cache{verstats}{chan} = $chan;
$cache{verstats}{who} = $who;
}
}
+ # hack. this is one major downside to scheduling.
+ $chan = $c;
&pSReply( &formListReply(0, "IRC Client versions for $c ", @list) );
# clean up not-needed data structures.
# 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];
+
+ # example of converting from RawReturn to sqlSelect.
+ my $where_href = (defined $c) ? { channel => $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 = &dbGetCol("stats", "nick,counter",
- $where." ORDER BY counter DESC LIMIT 3", 1);
+ 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!
- # todo: make dbGetCol return hash and array? too much effort.
my $tp = 0;
foreach $i (sort { $b <=> $a } keys %hash) {
foreach (keys %{ $hash{$i} }) {
&pSReply("zero counter for \037$type\037.");
}
} else {
- my %hash = &dbGetCol("stats", "type,counter",
- "$where AND nick=".&dbQuote($arg) );
+ # 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.
- my @array = &dbGet("stats", "nick",
+ # 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<scalar @array; $i++) {
+ $good = 0;
+ $ii = 0;
+ for(my $i=0; $i<scalar @array; $i++) {
next unless ($array[0] =~ /^\Q$who\E$/);
$good++;
last;
}
- $i++;
+ $ii++;
- my $total = scalar(@array);
+ $total = scalar(@array);
&DEBUG(" i => $i, good => $good, total => $total");
+ $x .= " ".$total."blah blah";
}
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 $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);
projects / infobot.git / blobdiff