summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
38b6396)
git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@714
c11ca15a-4712-0410-83d8-
924469b57eb5
my $max_time = &getChanConfDefault("seenMaxDays", 30) *60*60*24;
my $delete = 0;
my $max_time = &getChanConfDefault("seenMaxDays", 30) *60*60*24;
my $delete = 0;
- if ($param{'DBType'} =~ /^pgsql|mysql|sqlite/i) {
+ if ($param{'DBType'} =~ /^(pgsql|mysql|sqlite)/i) {
my $query;
if ($param{'DBType'} =~ /^mysql|sqlite$/i) {
my $query;
if ($param{'DBType'} =~ /^mysql|sqlite$/i) {
while (my @row = $sth->fetchrow_array) {
my ($nick,$time) = @row;
while (my @row = $sth->fetchrow_array) {
my ($nick,$time) = @row;
- &dbDel("seen",{"nick"=>$nick});
+ &sqlDelete("seen", { nick => $nick } );
$delete++;
}
$sth->finish;
$delete++;
}
$sth->finish;
my $time = time();
foreach (keys %seen) {
my $time = time();
foreach (keys %seen) {
- my $delta_time = $time - &dbGet("seen", "time", "nick", $_);
+ my $t2 = &sqlSelect("seen", "time", { nick => $_ }) || 0;
+ my $delta_time = $time - $t2;
next unless ($delta_time > $max_time);
&DEBUG("seenFlushOld: ".&Time2String($delta_time) );
next unless ($delta_time > $max_time);
&DEBUG("seenFlushOld: ".&Time2String($delta_time) );
my ($to_days,$dayname,$monname);
if ($param{'DBType'} =~ /^mysql|sqlite$/i) {
my ($to_days,$dayname,$monname);
if ($param{'DBType'} =~ /^mysql|sqlite$/i) {
- $to_days = (&dbRawReturn("SELECT TO_DAYS(NOW()) - TO_DAYS('$sqldate')"))[0];
- $dayname = (&dbRawReturn("SELECT DAYNAME('$sqldate')"))[0];
- $monname = (&dbRawReturn("SELECT MONTHNAME('$sqldate')"))[0];
+ $to_days = (&sqlRawReturn("SELECT TO_DAYS(NOW()) - TO_DAYS('$sqldate')"))[0];
+ $dayname = (&sqlRawReturn("SELECT DAYNAME('$sqldate')"))[0];
+ $monname = (&sqlRawReturn("SELECT MONTHNAME('$sqldate')"))[0];
} elsif ($param{'DBType'} =~ /^pgsql$/i) {
} elsif ($param{'DBType'} =~ /^pgsql$/i) {
- $to_days = (&dbRawReturn("SELECT date_trunc('day',
+ $to_days = (&sqlRawReturn("SELECT date_trunc('day',
'now'::timestamp - '$sqldate')"))[0];
'now'::timestamp - '$sqldate')"))[0];
- $dayname = qw(Sun Mon Tue Wed Thu Fri Sat)[(&dbRawReturn("SELECT extract(dow from timestamp '$sqldate')"))[0]];
- $monname = qw(BAD Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)[(&dbRawReturn("SELECT extract(month from timestamp '$sqldate')"))[0]];
+ $dayname = qw(Sun Mon Tue Wed Thu Fri Sat)[(&sqlRawReturn("SELECT extract(dow from timestamp '$sqldate')"))[0]];
+ $monname = qw(BAD Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)[(&sqlRawReturn("SELECT extract(month from timestamp '$sqldate')"))[0]];
} elsif ($param{'DBType'} =~ /^dbm$/i) {
&FIXME("Countdown: no dbm support");
} elsif ($param{'DBType'} =~ /^dbm$/i) {
&FIXME("Countdown: no dbm support");
- &performStrictReply("$factinfo{'factoid_key'} -- ". join("; ", @array) .".");
+ &pSReply("$factinfo{'factoid_key'} -- ". join("; ", @array) .".");
my ($type) = @_;
if ($type =~ /^author$/i) {
my ($type) = @_;
if ($type =~ /^author$/i) {
- my %hash = &dbGetCol("factoids", "factoid_key,created_by", "created_by IS NOT NULL");
+ my @array = &sqlSelectColArray("factoids",
+ "factoid_key,created_by", { },
+ "created_by IS NOT NULL"
+ );
my $thisnuh = $hash{$_};
$thisnuh =~ /^(\S+)!\S+@\S+$/;
my $thisnuh = $hash{$_};
$thisnuh =~ /^(\S+)!\S+@\S+$/;
} elsif ($type =~ /^vandalism$/i) {
&status("factstats(vandalism): starting...");
my $start_time = &timeget();
} elsif ($type =~ /^vandalism$/i) {
&status("factstats(vandalism): starting...");
my $start_time = &timeget();
- my %data = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL");
+ my %data = &sqlSelectColHash("factoids",
+ "factoid_key,factoid_value", { },
+ "factoid_value IS NOT NULL"
+ );
my @list;
my $delta_time = &timedelta($start_time);
my @list;
my $delta_time = &timedelta($start_time);
push(@list, "total prepared for deletion - $str");
# total unique authors.
push(@list, "total prepared for deletion - $str");
# total unique authors.
- foreach ( &dbRawReturn("SELECT created_by FROM factoids WHERE created_by IS NOT NULL") ) {
+ # todo: convert to sqlSelectColHash ? (or ColArray?)
+ foreach ( &sqlRawReturn("SELECT created_by FROM factoids WHERE created_by IS NOT NULL") ) {
/^(\S+)!/;
my $nick = lc $1;
$hash{$nick}++;
/^(\S+)!/;
my $nick = lc $1;
$hash{$nick}++;
undef %hash;
# total unique requesters.
undef %hash;
# total unique requesters.
- foreach ( &dbRawReturn("SELECT requested_by FROM factoids WHERE requested_by IS NOT NULL") ) {
+ foreach ( &sqlRawReturn("SELECT requested_by FROM factoids WHERE requested_by IS NOT NULL") ) {
/^(\S+)!/;
my $nick = lc $1;
$hash{$nick}++;
/^(\S+)!/;
my $nick = lc $1;
$hash{$nick}++;
} elsif ($type =~ /^dup(licate|e)$/i) {
&status("factstats(dupe): starting...");
my $start_time = &timeget();
} elsif ($type =~ /^dup(licate|e)$/i) {
&status("factstats(dupe): starting...");
my $start_time = &timeget();
- my %hash = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL", 1);
+ my %hash = &sqlSelectColHash("factoids",
+ "factoid_key,factoid_value", { },
+ "factoid_value IS NOT NULL", 1
+ );
my $refs = 0;
my @list;
my $v;
my $refs = 0;
my @list;
my $v;
return &formListReply(1, $prefix, @list);
} elsif ($type =~ /^locked$/i) {
return &formListReply(1, $prefix, @list);
} elsif ($type =~ /^locked$/i) {
- my %hash = &dbGetCol("factoids", "factoid_key,locked_by", "locked_by IS NOT NULL");
+ my %hash = &sqlSelectColhash("factoids",
+ "factoid_key,locked_by", { },
+ "locked_by IS NOT NULL"
+ );
my @list = keys %hash;
for (@list) {
my @list = keys %hash;
for (@list) {
return &formListReply(0, $prefix, @list);
} elsif ($type =~ /^new$/i) {
return &formListReply(0, $prefix, @list);
} elsif ($type =~ /^new$/i) {
- my %hash = &dbGetCol("factoids", "factoid_key,created_time", "created_time IS NOT NULL");
+ my %hash = &sqlSelectColHash("factoids",
+ "factoid_key,created_time", { },
+ "created_time IS NOT NULL"
+ );
my %age;
foreach (keys %hash) {
my %age;
foreach (keys %hash) {
return &formListReply(1, $prefix, @list);
} elsif ($type =~ /^profanity$/i) {
return &formListReply(1, $prefix, @list);
} elsif ($type =~ /^profanity$/i) {
- my %data = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL");
+ my %data = &sqlSelectColHash("factoids",
+ "factoid_key,factoid_value", { },
+ "factoid_value IS NOT NULL"
+ );
my @list;
foreach (keys %data) {
my @list;
foreach (keys %data) {
return &formListReply(1, $prefix, @newlist);
} elsif ($type =~ /^request(ed)?$/i) {
return &formListReply(1, $prefix, @newlist);
} elsif ($type =~ /^request(ed)?$/i) {
- my %hash = &dbGetCol("factoids", "factoid_key,requested_count", "requested_count IS NOT NULL", 1);
+ my %hash = &sqlSelectColHash("factoids",
+ "factoid_key,requested_count", { },
+ "requested_count IS NOT NULL", 1
+ );
if (!scalar keys %hash) {
return 'sorry, no factoids have been questioned.';
if (!scalar keys %hash) {
return 'sorry, no factoids have been questioned.';
return &formListReply(0, $prefix, @list);
} elsif ($type =~ /^reqrate$/i) {
return &formListReply(0, $prefix, @list);
} elsif ($type =~ /^reqrate$/i) {
- my %hash = &dbGetCol("factoids",
- "factoid_key,(unix_timestamp() - created_time)/requested_count as rate",
- "requested_by IS NOT NULL and created_time IS NOT NULL ORDER BY rate LIMIT 15", 1);
+ my %hash = &sqlSelectColHash("factoids",
+ "factoid_key,(unix_timestamp() - created_time)/requested_count as rate", { },
+ "requested_by IS NOT NULL and created_time IS NOT NULL ORDER BY rate LIMIT 15", 1
+ );
return &formListReply(0, $prefix, @list);
} elsif ($type =~ /^requesters?$/i) {
return &formListReply(0, $prefix, @list);
} elsif ($type =~ /^requesters?$/i) {
- my %hash = &dbGetCol("factoids", "factoid_key,requested_by", "requested_by IS NOT NULL");
+ my %hash = &sqlSelectColHash("factoids",
+ "factoid_key,requested_by", { },
+ "requested_by IS NOT NULL"
+ );
my %requester;
foreach (keys %hash) {
my %requester;
foreach (keys %hash) {
return &formListReply(1, $prefix, @list);
} elsif ($type =~ /^unrequest(ed)?$/i) {
return &formListReply(1, $prefix, @list);
} elsif ($type =~ /^unrequest(ed)?$/i) {
- my @list = &dbRawReturn("SELECT factoid_key FROM factoids WHERE requested_count IS NULL");
+ # todo: use sqlSelect()
+ my @list = &sqlRawReturn("SELECT factoid_key FROM factoids WHERE requested_count IS NULL");
for (@list) {
s/([\,\;]+)/\037$1\037/g;
for (@list) {
s/([\,\;]+)/\037$1\037/g;
sub rootWarn {
my ($nick,$user,$host,$chan) = @_;
my $n = lc $nick;
sub rootWarn {
my ($nick,$user,$host,$chan) = @_;
my $n = lc $nick;
- my $attempt = &dbGet("rootwarn", "attempt", "nick=".&dbQuote($n) ) || 0;
+ my $attempt = &sqlSelect("rootwarn", "attempt", { nick => $n } ) || 0;
my $warnmode = &getChanConf("rootWarnMode");
if ($attempt == 0) { # first timer.
my $warnmode = &getChanConf("rootWarnMode");
if ($attempt == 0) { # first timer.
# ok... don't record the attempt if nick==root.
return if ($nick eq "root");
# ok... don't record the attempt if nick==root.
return if ($nick eq "root");
- &dbSet("rootwarn", { nick => lc($nick) }, {
+ &sqlSet("rootwarn", { nick => lc($nick) }, {
attempt => $attempt,
time => time(),
host => $user."\@".$host,
attempt => $attempt,
time => time(),
host => $user."\@".$host,
- my $karma = &dbGet("stats", "counter",
- "nick=".&dbQuote($term)." AND type='karma'") || 0;
+ my $karma = &sqlSelect("stats", "counter",
+ { nick => $term, type => "karma" }) || 0;
if ($inc eq '++') {
$karma++;
} else {
$karma--;
}
if ($inc eq '++') {
$karma++;
} else {
$karma--;
}
{ nick => $term, type => "karma" }, # WHERE
# { counter => $karma } # WHAT
{ -counter => "counter+1" }
{ nick => $term, type => "karma" }, # WHERE
# { counter => $karma } # WHAT
{ -counter => "counter+1" }
sub karma {
my $target = lc( shift || $who );
sub karma {
my $target = lc( shift || $who );
- my $karma = &dbGet("stats", "counter", "nick=".
- &dbQuote($target)." AND type='karma'") || 0;
+ my $karma = &sqlSelect("stats", "counter",
+ { nick => $target, type => "karma" }) || 0;
if ($karma != 0) {
&pSReply("$target has karma of $karma");
if ($karma != 0) {
&pSReply("$target has karma of $karma");