# NOTE: Based on code by Kevin Lenzo & Patrick Cole (c) 1997
#
-#use strict;
+use strict;
+
+use vars qw(%file %mask %param %cmdstats %myModules);
+use vars qw($msgType $who $bot_pid $nuh $shm $force_public_reply
+ $no_timehires $bot_data_dir $addrchar);
sub help {
my $topic = shift;
my $file = $bot_data_dir."/blootbot.help";
my %help = ();
- # crude hack for pSReply() to work as expected.
- $msgType = "private" if ($msgType eq "public");
+ # crude hack for performStrictReply() to work as expected.
+ $msgType = 'private' if ($msgType eq 'public');
if (!open(FILE, $file)) {
&ERROR("Failed reading help file ($file): $!");
$val =~ s/__/\037/g;
$val =~ s/==/ /;
- $help{$key} = "" if (!exists $help{$key});
+ $help{$key} = '' if (!exists $help{$key});
$help{$key} .= $val."\n";
}
close FILE;
- if (!defined $topic or $topic eq "") {
+ if (!defined $topic or $topic eq '') {
&msg($who, $help{'main'});
my $i = 0;
&performStrictReply($_);
}
} else {
- &pSReply("no help on $topic. Use 'help' without arguments.");
+ &performStrictReply("no help on $topic. Use 'help' without arguments.");
}
return '';
} else { # the real thing.
return [gettimeofday()];
}
-}
+}
sub timedelta {
my($start_time) = shift;
sub formListReply {
my($rand, $prefix, @list) = @_;
my $total = scalar @list;
- my $maxshow = $param{'maxListReplyCount'} || 10;
- my $maxlen = $param{'maxListReplyLength'} || 400;
+ my $maxshow = &getChanConfDefault('maxListReplyCount', 15, $chan);
+ my $maxlen = &getChanConfDefault('maxListReplyLength', 400, $chan);
my $reply;
+ # remove irc overhead
+ $maxlen -= 30;
+
# no results.
return $prefix ."returned no results." unless ($total);
push(@rand, $list[$_]);
last if (scalar @rand == $maxshow);
}
- @list = @rand;
+ if ($total > $maxshow) {
+ @list = sort @rand;
+ } else {
+ @list = @rand;
+ }
} elsif ($total > $maxshow) {
&status("formListReply: truncating list.");
}
# form the reply.
+ # FIXME: should grow and exit when full, not discard any that are oversize
while () {
- $reply = $prefix ."(\002". scalar(@list). "\002 shown";
- $reply .= "; \002$total\002 total" if ($total != scalar @list);
- $reply .= "): ". join(" \002;;\002 ",@list) .".";
+ $reply = $prefix ."(\002". scalar(@list). "\002";
+ $reply .= " of \002$total\002" if ($total != scalar @list);
+ $reply .= "): " . join(" \002;;\002 ", @list) .".";
last if (length($reply) < $maxlen and scalar(@list) <= $maxshow);
last if (scalar(@list) == 1);
# Usage: &IJoin(@array);
sub IJoin {
if (!scalar @_) {
- return "NULL";
+ return 'NULL';
} elsif (scalar @_ == 1) {
return $_[0];
} else {
#####
# Usage: &Time2String(seconds);
sub Time2String {
- my $time = shift;
- my $retval;
+ my ($time) = @_;
+ my $prefix = '';
+ my (@s, @t);
- return("NULL s") if (!defined $time or $time !~ /\d+/);
+ return 'NULL' if (!defined $time);
+ return $time if ($time !~ /\d+/);
- my $prefix = "";
if ($time < 0) {
$time = - $time;
$prefix = "- ";
}
- my $s = int($time) % 60;
- my $m = int($time / 60) % 60;
- my $h = int($time / 3600) % 24;
- my $d = int($time / 86400);
+ $t[0] = int($time) % 60;
+ $t[1] = int($time / 60) % 60;
+ $t[2] = int($time / 3600) % 24;
+ $t[3] = int($time / 86400);
- my @data;
- push(@data, sprintf("\002%d\002d", $d)) if ($d != 0);
- push(@data, sprintf("\002%d\002h", $h)) if ($h != 0);
- push(@data, sprintf("\002%d\002m", $m)) if ($m != 0);
- push(@data, sprintf("\002%d\002s", $s)) if ($s != 0 or !@data);
+ push(@s, "$t[3]d") if ($t[3] != 0);
+ push(@s, "$t[2]h") if ($t[2] != 0);
+ push(@s, "$t[1]m") if ($t[1] != 0);
+ push(@s, "$t[0]s") if ($t[0] != 0 or !@s);
- return $prefix.join(' ', @data);
+ my $retval = $prefix.join(' ', @s);
+ $retval =~ s/(\d+)/\002$1\002/g;
+ return $retval;
}
###
# generate a hash list.
foreach (@files) {
- if (/^(.*\/)(.*?)$/) {
- $files{$1}{$2} = 1;
- }
+ next unless /^(.*\/)(.*?)$/;
+
+ $files{$1}{$2} = 1;
}
@files = (); # reuse the array.
return $str;
}
- if ($str eq "has") {
- $str = "have" if ($int > 1);
- } elsif ($str eq "is") {
- $str = "are" if ($int > 1);
- } elsif ($str eq "was") {
- $str = "were" if ($int > 1);
- } elsif ($str eq "this") {
- $str = "these" if ($int > 1);
+ if ($str eq 'has') {
+ $str = 'have' if ($int > 1);
+ } elsif ($str eq 'is') {
+ $str = 'are' if ($int > 1);
+ } elsif ($str eq 'was') {
+ $str = 'were' if ($int > 1);
+ } elsif ($str eq 'this') {
+ $str = 'these' if ($int > 1);
} elsif ($str =~ /y$/) {
if ($int > 1) {
if ($str =~ /ey$/) {
- $str .= "s"; # eg: "money" => "moneys".
+ $str .= 's'; # eg: 'money' => 'moneys'.
} else {
$str =~ s/y$/ies/;
}
}
} else {
- $str .= "s" if ($int != 1);
+ $str .= 's' if ($int != 1);
}
return $str;
my $i = $1;
my $fuzzy = int(rand 5);
if ($i < 10) {
- return $i*60;
+ return $i;
}
if (rand > 0.5) {
return ($i - $fuzzy)*60;
$this{'host'} = &makeHostMask(lc $3);
} else {
&WARN("IHM: thisnuh is invalid '$thisnuh'.");
- return 1 if ($thisnuh eq "");
+ return 1 if ($thisnuh eq '');
return 0;
}
return 0;
}
+sub isFileUpdated {
+ my ($file, $time) = @_;
+
+ if (! -f $file) {
+ return 1;
+ }
+
+ my $time_file = (stat $file)[9];
+
+ if ($time <= $time_file) {
+ return 0;
+ } else {
+ return 1;
+ }
+}
+
##########
### make commands.
###
# Usage: &makeHostMask($host);
sub makeHostMask {
my ($host) = @_;
- my $nu = "";
+ my $nu = '';
if ($host =~ s/^(\S+!\S+\@)//) {
&DEBUG("mHM: detected nick!user\@ for host arg; fixing");
sub checkMsgType {
my ($reply) = @_;
- return unless (&IsParam("minLengthBeforePrivate"));
+ return unless (&IsParam('minLengthBeforePrivate'));
return if ($force_public_reply);
if (length $reply > $param{'minLengthBeforePrivate'}) {
sub validExec {
my ($str) = @_;
- if ($str =~ /[\'\"\|]/) { # invalid.
+ if ($str =~ /[\`\'\"\|]/) { # invalid.
return 0;
} else { # valid.
return 1;
for (lc $string) {
/fuck/ and last;
/dick|dildo/ and last;
- /shit|turd|crap/ and last;
+ /shit/ and last;
/pussy|[ck]unt/ and last;
/wh[0o]re|bitch|slut/ and last;
return $profanity;
}
-sub hasParam {
+sub IsChanConfOrWarn {
my ($param) = @_;
- if (&IsChanConf($param) or &IsParam($param)) {
+ if (&IsChanConf($param) > 0) {
return 1;
} else {
### TODO: specific reason why it failed.
&shmFlush();
&VERB("double fork detected; not forking.",2) if ($$ != $bot_pid);
- if (&IsParam("forking") and $$ == $bot_pid) {
+ if (&IsParam('forking') and $$ == $bot_pid) {
return unless &addForked($label);
$SIG{CHLD} = 'IGNORE';
select(undef, undef, undef, 0.2);
# &status("fork starting for '$label', PID == $$.");
- &status("--- fork starting for '$label', PID == $$ ---");
+ &status("--- fork starting for '$label', PID == $$, bot_pid == $bot_pid ---");
&shmWrite($shm,"SET FORKPID $label $$");
sleep 1;
### TODO: use AUTOLOAD
### very lame hack.
- if ($label !~ /-/ and !&loadMyModule($myModules{$label})) {
+ if ($label !~ /-/ and !&loadMyModule($label)) {
&DEBUG("Forker: failed?");
&delForked($label);
}
}
sub closeStats {
- return unless (&getChanConfList("ircTextCounters"));
+ return unless (&getChanConfList('ircTextCounters'));
foreach (keys %cmdstats) {
my $type = $_;
- my $i = &dbGet("stats", "counter", "nick=".&dbQuote($type).
- " AND type='cmdstats'");
+ my $i = &sqlSelect('stats', 'counter', {
+ nick => $type,
+ type => 'cmdstats',
+ } );
my $z = 0;
$z++ unless ($i);
$i += $cmdstats{$type};
- my %hash = (
- nick => $type,
- type => "cmdstats",
- counter => $i
- );
- $hash{time} = time() if ($z);
- &dbReplace("stats", "nick", %hash);
+ &sqlSet('stats', {'nick' => $type}, {
+ type => 'cmdstats',
+ 'time' => time(),
+ counter => $i,
+ } );
}
}
projects / infobot.git / blobdiff