#
# ProcessExtra.pl: Extensions to Process.pl
# Author: dms
-# Version: v0.4 (20000918)
+# Version: v0.5 (20010124)
# Created: 20000117
#
if (&IsParam("useStrict")) { use strict; }
+use POSIX qw(strftime);
+use vars qw(%sched);
+
+#
+# is there a point in ScheduleChecked()?
+# not yet... not unless we run setupSchedulers more than once.
+#
+
sub setupSchedulers {
&VERB("Starting schedulers...",2);
# ONCE OFF.
# REPETITIVE.
- &uptimeCycle(1) if (&IsParam("uptime"));
- &randomQuote(1) if (&IsParam("randomQuote"));
- &randomFactoid(1) if (&IsParam("randomFactoid"));
- &logCycle(1) if ($loggingstatus and &IsParam("logFile") and &IsParam("maxLogSize"));
- &limitCheck(1) if (&IsParam("limitcheck"));
+ &uptimeLoop(1);
+ &randomQuote(2);
+ &randomFactoid(2);
+ &randomFreshmeat(2);
+ &logLoop(1);
+ &chanlimitCheck(1);
&netsplitCheck(1); # mandatory
- &floodCycle(1); # mandatory
- &seenFlush(1) if (&IsParam("seen") and &IsParam("seenFlushInterval"));
+ &floodLoop(1); # mandatory
+ &seenFlush(1);
&leakCheck(1); # mandatory
- &ignoreListCheck(1);# mandatory
- &seenFlushOld(1) if (&IsParam("seen"));
+ &ignoreCheck(1); # mandatory
+ &seenFlushOld(1);
&ircCheck(1); # mandatory
&miscCheck(1); # mandatory
&shmFlush(1); # mandatory
- &slashdotCycle(1) if (&IsParam("slashdot") and &IsParam("slashdotAnnounce"));
- &freshmeatCycle(1) if (&IsParam("freshmeat") and &IsParam("freshmeatAnnounce"));
- &kernelCycle(1) if (&IsParam("kernel") and &IsParam("kernelAnnounce"));
- &wingateWriteFile(1) if (&IsParam("wingate"));
- &factoidCheck(1) if (&IsParam("factoidDeleteDelay"));
+ &slashdotLoop(2);
+ &freshmeatLoop(2);
+ &kernelLoop(2);
+ &wingateWriteFile(1);
+ &factoidCheck(1);
+
+# my $count = map { exists $sched{$_}{TIME} } keys %sched;
+ my $count = 0;
+ foreach (keys %sched) {
+ next unless (exists $sched{$_}{TIME});
+ $count++;
+ }
+
+ &status("Schedulers: $count will be running.");
+### &scheduleList();
}
sub ScheduleThis {
my ($interval, $codename, @args) = @_;
my $waittime = &getRandomInt($interval);
+ if (!defined $waittime) {
+ &WARN("interval == waittime == UNDEF for $codename.");
+ return;
+ }
+
+ if (exists $sched{$codename}{RUNNING}) {
+ &WARN("Sched for $codename already exists. forgot ScheduleChecked?");
+ return;
+ }
+
&VERB("Scheduling \&$codename() for ".&Time2String($waittime),3);
- $conn->schedule($waittime, \&$codename, @args);
+ my $retval = $conn->schedule($waittime, \&$codename, @args);
+ $sched{$codename}{LABEL} = $retval;
+ $sched{$codename}{TIME} = time()+$waittime;
+ $sched{$codename}{RUNNING} = 1;
}
+sub ScheduleChecked {
+ my ($codename) = shift;
+
+ # what the hell is this for?
+ if (exists $sched{$codename}{RUNNING}) {
+### &DEBUG("SC: Removed $codename.");
+ delete $sched{$codename}{RUNNING};
+ } else {
+### &WARN("sched $codename already removed.");
+ }
+}
+
+####
+#### LET THE FUN BEGIN.
+####
+
sub randomQuote {
+ my $interval = $param{'randomQuoteInterval'} || 60;
+ &ScheduleThis($interval, "randomQuote") if (@_);
+ &ScheduleChecked("randomQuote");
+ return if ($_[0] eq "2"); # defer.
+
my $line = &getRandomLineFromFile($bot_misc_dir. "/blootbot.randtext");
if (!defined $line) {
&ERROR("random Quote: weird error?");
return;
}
- my @channels = split(/[\s\t]+/, lc $param{'randomQuoteChannels'});
- @channels = keys(%channels) unless (scalar @channels);
-
- my $good = 0;
- foreach (@channels) {
- next unless (&validChan($_));
+ foreach ( &ChanConfList("randomQuote") ) {
+ next unless (&validChan($_)); # ???
&status("sending random Quote to $_.");
&action($_, "Ponders: ".$line);
- $good++;
}
-
- if (!$good) {
- &WARN("randomQuote: no valid channels?");
- return;
- }
-
- my $interval = $param{'randomQuoteInterval'} || 60;
- &ScheduleThis($interval, "randomQuote") if (@_);
+ ### TODO: if there were no channels, don't reschedule until channel
+ ### configuration is modified.
}
sub randomFactoid {
my ($key,$val);
my $error = 0;
+
+ my $interval = $param{'randomFactoidInterval'} || 60; # FIXME.
+ &ScheduleThis($interval, "randomFactoid") if (@_);
+ &ScheduleChecked("randomFactoid");
+ return if ($_[0] eq "2"); # defer.
+
while (1) {
($key,$val) = &randKey("factoids","factoid_key,factoid_value");
### $val =~ tr/^[A-Z]/[a-z]/; # blah is Good => blah is good.
}
}
- my @channels = split(/[\s\t]+/, lc $param{'randomFactoidChannels'});
- @channels = keys(%channels) unless (scalar @channels);
-
- my $good = 0;
- foreach (@channels) {
- next unless (&validChan($_));
+ foreach ( &ChanConfList("randomFactoid") ) {
+ next unless (&validChan($_)); # ???
&status("sending random Factoid to $_.");
-### &msg($_, "$key is $val");
&action($_, "Thinks: \037$key\037 is $val");
### FIXME: Use &getReply() on above to format factoid properly?
$good++;
}
+}
- if (!$good) {
- &WARN("randomFactoid: no valid channels?");
- return;
- }
+sub randomFreshmeat {
+ my $interval = $param{'randomFresheatInterval'} || 60;
+ &ScheduleThis($interval, "randomFreshmeat") if (@_);
+ &ScheduleChecked("randomFreshmeat");
+ return if ($_[0] eq "2"); # defer.
- my $interval = $param{'randomFactoidInterval'} || 60;
- &ScheduleThis($interval, "randomFactoid") if (@_);
+ my @chans = &ChanConfList("randomFreshmeat");
+ return unless (scalar @chans);
+
+ &Forker("freshmeat", sub {
+ my $retval = &Freshmeat::randPackage();
+
+ foreach (@chans) {
+ next unless (&validChan($_)); # ???
+
+ &status("sending random Freshmeat to $_.");
+ &say($_, $line);
+ }
+ } );
}
-sub logCycle {
- # check if current size is too large.
+sub logLoop {
+ if (@_) {
+ &ScheduleThis(60, "logLoop");
+ &ScheduleChecked("logLoop");
+ return if ($_[0] eq "2"); # defer.
+ }
+
+ return unless (defined fileno LOG);
+ return unless (&IsParam("logfile"));
+ return unless (&IsParam("maxLogSize"));
+
+ ### check if current size is too large.
if ( -s $file{log} > $param{'maxLogSize'}) {
my $date = sprintf("%04d%02d%02d", (localtime)[5,4,3]);
$file{log} = $param{'logfile'} ."-". $date;
&status("cycling log file.");
}
- # check if all the logs exceed size.
+ ### check if all the logs exceed size.
my $logdir = "$bot_base_dir/log/";
if (opendir(LOGS, $logdir)) {
my $tsize = 0;
my (%age, %size);
while (defined($_ = readdir LOGS)) {
- my $logfile = "$logdir/$_";
+ my $logfile = "$logdir/$_";
next unless ( -f $logfile);
- my $size = -s $logfile;
- my $age = (stat $logfile)[9]; ### or 8 ?
+ my $size = -s $logfile;
+ my $age = (stat $logfile)[9];
$age{$age} = $logfile;
$size{$logfile} = $size;
}
closedir LOGS;
- my $delete = 0;
+ my $delete = 0;
while ($tsize > $param{'maxLogSize'}) {
&status("LOG: current size > max ($tsize > $param{'maxLogSize'})");
- my $oldest = (sort {$a <=> $b} keys %age)[0];
+ my $oldest = (sort {$a <=> $b} keys %age)[0];
&status("LOG: unlinking $age{$oldest}.");
- ### NOT YET.
- # unlink $age{$oldest};
- $tsize -= $oldest;
+ unlink $age{$oldest};
+ $tsize -= $oldest;
$delete++;
}
### TODO: add how many b,kb,mb removed?
- if ($delete) {
- &status("LOG: removed $delete logs.");
- }
+ &status("LOG: removed $delete logs.") if ($delete);
} else {
&WARN("could not open dir $logdir");
}
- &ScheduleThis(60, "logCycle") if (@_);
}
sub seenFlushOld {
- my $max_time = $param{'seenMaxDays'}*60*60*24;
+ if (@_) {
+ &ScheduleThis(1440, "seenFlushOld");
+ &ScheduleChecked("seenFlushOld");
+ return if ($_[0] eq "2"); # defer.
+ }
+
+ # is this global-only?
+ return unless (&IsChanConf("seen") > 0);
+ return unless (&IsChanConf("seenFlushInterval") > 0);
+
+ my $max_time = ($chanconf{_default}{'seenMaxDays'} || 30)
+ *60*60*24; # global.
my $delete = 0;
if ($param{'DBType'} =~ /^pg|postgres|mysql/i) {
}
&VERB("SEEN deleted $delete seen entries.",2);
- &ScheduleThis(1440, "seenFlushOld") if (@_);
}
-sub limitCheck {
- my $limitplus = $param{'limitcheckPlus'} || 5;
-
- if (scalar keys %netsplit) {
- &status("limitcheck: netsplit active.");
- return;
+sub chanlimitCheck {
+ if (@_) {
+ my $interval = &getChanConf("chanlimitcheckInterval") || 10;
+ &ScheduleThis($interval, "chanlimitCheck");
+ &ScheduleChecked("chanlimitCheck");
+ return if ($_[0] eq "2");
}
- my @channels = split(/[\s\t]+/, lc $param{'limitcheck'});
+ foreach ( &ChanConfList("chanlimitcheck") ) {
+ next unless (&validChan($_)); # ???
- foreach (@channels) {
- next unless (&validChan($_));
+ my $limitplus = &getChanConf("chanlimitcheckPlus",$_) || 5;
+ my $newlimit = scalar(keys %{$channels{$_}{''}}) + $limitplus;
+ my $limit = $channels{$_}{'l'};
- if (!exists $channels{$_}{'o'}{$ident}) {
- &ERROR("limitcheck: dont have ops on $_.");
- next;
+ if (scalar keys %{$channels{$_}{''}} > $limit) {
+ &status("LIMIT: set too low!!! FIXME");
+ ### run NAMES again and flush it.
}
- my $newlimit = scalar(keys %{$channels{$_}{''}}) + $limitplus;
- my $limit = $channels{$_}{'l'};
-
next unless (!defined $limit or $limit != $newlimit);
+ if (!exists $channels{$_}{'o'}{$ident}) {
+ &ERROR("chanlimitcheck: dont have ops on $_.");
+ next;
+ }
&rawout("MODE $_ +l $newlimit");
}
- my $interval = $param{'limitcheckInterval'} || 10;
- &ScheduleThis($interval, "limitCheck") if (@_);
}
sub netsplitCheck {
my ($s1,$s2);
+ if (@_) {
+ &ScheduleThis(30, "netsplitCheck");
+ &ScheduleChecked("netsplitCheck");
+ return if ($_[0] eq "2");
+ }
+
foreach $s1 (keys %netsplitservers) {
foreach $s2 (keys %{$netsplitservers{$s1}}) {
if (time() - $netsplitservers{$s1}{$s2} > 3600) {
delete $netsplit{$_};
}
next unless (time() - $netsplit{$_} > 60*60*2); # 2 hours.
+ next if (&IsNickInAnyChan($_));
- if (!&IsNickInAnyChan($_)) {
- &DEBUG("netsplitC: $_ didn't come back from netsplit in 2 hours; removing from netsplit list.");
- delete $netsplit{$_};
- }
+ &DEBUG("netsplitC: $_ didn't come back from netsplit in 2 hours; removing from netsplit list.");
+ delete $netsplit{$_};
}
-
- &ScheduleThis(30, "netsplitCheck") if (@_);
}
-sub floodCycle {
- my $interval = $param{'floodInterval'} || 60; # seconds.
- my $delete = 0;
-
+sub floodLoop {
+ my $delete = 0;
my $who;
+
+ if (@_) {
+ &ScheduleThis(60, "floodLoop"); # minutes.
+ &ScheduleChecked("floodLoop");
+ return if ($_[0] eq "2");
+ }
+
+ my $time = time();
+ my $interval = &getChanConfDefault("floodCycle",60);
+
foreach $who (keys %flood) {
foreach (keys %{$flood{$who}}) {
- if (time() - $flood{$who}{$_} > $interval) {
+ if (!exists $flood{$who}{$_}) {
+ &WARN("flood{$who}{$_} undefined?");
+ next;
+ }
+
+ if ($time - $flood{$who}{$_} > $interval) {
delete $flood{$who}{$_};
$delete++;
}
}
}
- &VERB("floodCycle: deleted $delete items.",2);
-
- &ScheduleThis($interval, "floodCycle") if (@_); # minutes.
+ &VERB("floodLoop: deleted $delete items.",2);
}
sub seenFlush {
- my $nick;
- my $flushed = 0;
my %stats;
+ my $nick;
+ my $flushed = 0;
$stats{'count_old'} = &countKeys("seen");
$stats{'new'} = 0;
$stats{'old'} = 0;
+ if (@_) {
+ my $interval = $param{'seenFlushInterval'} || 60;
+ &ScheduleThis($interval, "seenFlush");
+ &ScheduleChecked("seenFlush");
+ return if ($_[0] eq "2");
+ }
+
if ($param{'DBType'} =~ /^mysql|pg|postgres/i) {
foreach $nick (keys %seencache) {
my $exists = &dbGet("seen","nick", $nick, "nick");
$stats{'new'}++;
### TODO: put bad nick into a list and don't do it again!
- if ($retval == 0) {
- &ERROR("Should never happen! (nick => $nick) FIXME");
- }
+ &FIXME("Should never happen! (nick => $nick)") if !$retval;
}
delete $seencache{$nick};
) );
### TODO: put bad nick into a list and don't do it again!
- if ($retval == 0) {
- &ERROR("Should never happen! (nick => $nick) FIXME");
- }
+ &FIXME("Should never happen! (nick => $nick)") if !$retval;
delete $seencache{$nick};
$flushed++;
&DEBUG("seenFlush: NO VALID FACTOID SUPPORT?");
}
- &DEBUG(sprintf("new seen: %03.01f%% (%d/%d)",
- $stats{'new'}*100/$stats{'count_old'}),
- $stats{'new'}, $stats{'count_old'} );
- &DEBUG(sprintf("now seen: %3.1f%% (%d/%d)",
- $stats{'old'}*100/&countKeys("seen")),
- $stats{'old'}, &countKeys("seen") );
+ if ($stats{'count_old'} ||= 1) {
+ &DEBUG("had to set count_old to 1.");
+ }
- &VERB("Flushed $flushed seen entries.",1); # was 2.
- &DEBUG("seen: ".scalar(keys %seenflush)." remaining.");
+ &status("Flushed $flushed seen entries.") if ($flushed);
+ &VERB(sprintf(" new seen: %03.01f%% (%d/%d)",
+ $stats{'new'}*100/$stats{'count_old'},
+ $stats{'new'}, $stats{'count_old'} ), 2) if ($stats{'new'});
+ &VERB(sprintf(" now seen: %3.1f%% (%d/%d)",
+ $stats{'old'}*100/&countKeys("seen"),
+ $stats{'old'}, &countKeys("seen") ), 2) if ($stats{'old'});
+
+ &WARN("scalar keys seenflush != 0!") if (scalar keys %seenflush);
- my $interval = $param{'seenFlushInterval'} || 60;
- &ScheduleThis($interval, "seenFlush") if (@_);
}
sub leakCheck {
my ($blah1,$blah2);
my $count = 0;
+ if (@_) {
+ &ScheduleThis(60, "leakCheck");
+ &ScheduleChecked("leakCheck");
+ return if ($_[0] eq "2");
+ }
+
# flood.
foreach $blah1 (keys %flood) {
foreach $blah2 (keys %{$flood{$blah1}}) {
}
}
- &ScheduleThis(60, "leakCheck") if (@_);
+ my $delete = 0;
+ foreach (keys %nuh) {
+ next if (&IsNickInAnyChan($_));
+ delete $nuh{$_};
+ $delete++;
+ }
+
+ &DEBUG("$delete nuh{} items deleted; now have ".
+ scalar(keys %nuh) ) if ($delete);
}
-sub ignoreListCheck {
- my $time = time();
- my $count = 0;
+sub ignoreCheck {
+ if (@_) {
+ &ScheduleThis(60, "ignoreCheck");
+ &ScheduleChecked("ignoreCheck");
+ }
- foreach (keys %ignoreList) {
- next if ($ignoreList{$_} == 1);
- next unless ($time > $ignoreList{$_});
+ my $time = time();
+ my $count = 0;
- delete $ignoreList{$_};
- &status("ignore: $_ has expired.");
- $count++;
+ foreach (keys %ignore) {
+ my $chan = $_;
+
+ foreach (keys %{ $ignore{$chan} }) {
+ my @array = @{ $ignore{$chan}{$_} };
+
+ foreach (@array) {
+ &DEBUG("ignore: => $_");
+ }
+
+ next unless ($array[0] and $time > $array[0]);
+
+ delete $ignore{$chan}{$_};
+ &status("ignore: $_/$chan has expired.");
+ $count++;
+ }
}
&VERB("ignore: $count items deleted.",2);
-
- &ScheduleThis(30, "ignoreListCheck") if (@_);
}
sub ircCheck {
- my @array = split /[\t\s]+/, $param{'join_channels'};
+ my @array = grep !/^_default$/, keys %chanconf;
my $iconf = scalar(@array);
my $inow = scalar(keys %channels);
if ($iconf > 2 and $inow * 2 <= $iconf) {
&FIXME("ircCheck: current channels * 2 <= config channels. FIXME.");
}
+ # chanserv ops.
+ foreach ( &ChanConfList("chanServ_ops") ) {
+ next if (exists $channels{$chan}{'o'}{$ident});
+
+ &status("ChanServ ==> Requesting ops for $chan.");
+ &rawout("PRIVMSG ChanServ :OP $chan $ident");
+ }
+
if (!$conn->connected and time - $msgtime > 3600) {
&WARN("ircCheck: no msg for 3600 and disco'd! reconnecting!");
$msgtime = time(); # just in case.
if ($ident !~ /^\Q$param{ircNick}\E$/) {
&WARN("ircCheck: ident($ident) != param{ircNick}($param{IrcNick}).");
+ ### TODO: schedule check for own nick if taken?
}
&joinNextChan();
if (grep /^\s*$/, keys %channels) {
&WARN("we have a NULL chan in hash channels? removing!");
- delete $channels{''};
- &status("channels now:");
+ delete $channels{''}; # ???
+ &DEBUG("channels now:");
foreach (keys %channels) {
&status(" $_");
}
+ &DEBUG("channels END");
}
+ ### USER FILE.
+ if ($utime_userfile > $wtime_userfile and time() - $wtime_userfile > 3600) {
+ &writeUserFile();
+ $wtime_userfile = time();
+ }
+ ### CHAN FILE.
+ if ($utime_chanfile > $wtime_chanfile and time() - $wtime_chanfile > 3600) {
+ &writeChanFile();
+ $wtime_chanfile = time();
+ }
&ScheduleThis(240, "ircCheck") if (@_);
}
sub miscCheck {
+ &ScheduleThis(240, "miscCheck") if (@_);
+
# SHM check.
my @ipcs;
if ( -x "/usr/bin/ipcs") {
@ipcs = `/usr/bin/ipcs`;
} else {
&WARN("ircCheck: no 'ipcs' binary.");
+ return;
}
# shmid stale remove.
my ($shmid, $size) = ($2,$5);
next unless ($shmid != $shm and $size == 2000);
- &status("SHM: nuking shmid $shmid");
- system("/usr/bin/ipcrm shm $shmid >/dev/null");
+### &status("SHM: nuking shmid $shmid");
+### system("/usr/bin/ipcrm shm $shmid >/dev/null");
}
### check modules if they've been modified. might be evil.
&reloadAllModules();
-
- &ScheduleThis(240, "miscCheck") if (@_);
}
sub shmFlush {
+ if (@_) {
+ &ScheduleThis(5, "shmFlush");
+ &ScheduleChecked("shmFlush");
+ return if ($_[0] eq "2");
+ }
+
my $shmmsg = &shmRead($shm);
$shmmsg =~ s/\0//g; # remove padded \0's.
+ return if ($$ != $::bot_pid); # fork protection.
+
foreach (split '\|\|', $shmmsg) {
- &status("shm: Processing '$_'.");
+ &VERB("shm: Processing '$_'.",2);
if (/^DCC SEND (\S+) (\S+)$/) {
my ($nick,$file) = ($1,$2);
$conn->new_send($1,$2);
$dcc{'SEND'}{$who} = time();
}
+ } elsif (/^SET FORKPID (\S+) (\S+)/) {
+ $forked{$1}{PID} = $2;
} elsif (/^DELETE FORK (\S+)$/) {
delete $forked{$1};
} elsif (/^EVAL (.*)$/) {
}
&shmWrite($shm,"") if ($shmmsg ne "");
-
- &ScheduleThis(5, "shmFlush") if (@_);
}
+### this is semi-scheduled
sub getNickInUse {
if ($ident eq $param{'ircNick'}) {
&status("okay, got my nick back.");
&ScheduleThis(5, "getNickInUse") if (@_);
}
-sub uptimeCycle {
- &uptimeWriteFile();
+sub uptimeLoop {
+ if (@_) {
+ &ScheduleThis(60, "uptimeLoop");
+ &ScheduleChecked("uptimeLoop");
+ }
- &ScheduleThis(60, "uptimeCycle") if (@_);
+ &uptimeWriteFile();
}
-sub slashdotCycle {
- &Forker("slashdot", sub { &Slashdot::slashdotAnnounce(); } );
+sub slashdotLoop {
+ &ScheduleThis(60, "slashdotLoop") if (@_);
+ &ScheduleChecked("slashdotLoop");
+ return if ($_[0] eq "2");
+
+ my @chans = &ChanConfList("slashdotAnnounce");
+ return unless (scalar @chans);
+
+ &Forker("slashdot", sub {
+ my @data = &Slashdot::slashdotAnnounce();
- &ScheduleThis(60, "slashdotCycle") if (@_);
+ foreach (@chans) {
+ next unless (&::validChan($_));
+
+ &::status("sending slashdot update to $_.");
+ my $c = $_;
+ foreach (@data) {
+ ¬ice($c, "Slashdot: $_");
+ }
+ }
+ } );
}
-sub freshmeatCycle {
- &Forker("freshmeat", sub { &Freshmeat::freshmeatAnnounce(); } );
+sub freshmeatLoop {
+ if (@_) {
+ &ScheduleThis(60, "freshmeatLoop");
+ &ScheduleChecked("freshmeatLoop");
+ return if ($_[0] eq "2");
+ }
+
+ my @chans = &ChanConfList("freshmeatAnnounce");
+ return unless (scalar @chans);
- &ScheduleThis(60, "freshmeatCycle") if (@_);
+ &Forker("freshmeat", sub {
+ my $data = &Freshmeat::freshmeatAnnounce();
+
+ foreach (@chans) {
+ next unless (&::validChan($_));
+
+ &::status("sending freshmeat update to $_.");
+ &msg($_, $data);
+ }
+ } );
}
-sub kernelCycle {
- &Forker("kernel", sub { &Kernel::kernelAnnounce(); } );
+sub kernelLoop {
+ if (@_) {
+ &ScheduleThis(240, "kernelLoop");
+ &ScheduleChecked("kernelLoop");
+ return if ($_[0] eq "2");
+ }
+
+ my @chans = &ChanConfList("kernelAnnounce");
+ return unless (scalar @chans);
+
+ &Forker("kernel", sub {
+ my @data = &Kernel::kernelAnnounce();
+
+ foreach (@chans) {
+ next unless (&::validChan($_));
- &ScheduleThis(240, "kernelCycle") if (@_);
+ &::status("sending kernel update to $_.");
+ my $c = $_;
+ foreach (@data) {
+ ¬ice($c, "Kernel: $_");
+ }
+ }
+ } );
}
sub wingateCheck {
- return unless &IsParam("wingate");
- return unless ($param{'wingate'} =~ /^(.*\s+)?$chan(\s+.*)?$/i);
+ return unless &IsChanConf("wingate");
### FILE CACHE OF OFFENDING WINGATES.
foreach (grep /^$host$/, @wingateBad) {
&status("Wingate: RUNNING ON $host BY $who");
- &ban("*!*\@$host", "") if &IsParam("wingateBan");
+ &ban("*!*\@$host", "") if &IsChanConf("wingateBan");
- next unless (&IsParam("wingateKick"));
- &kick($who, "", $param{'wingateKick'})
+ my $reason = &getChanConf("wingateKick");
+
+ next unless ($reason);
+ &kick($who, "", $reason)
}
### RUN CACHE OF TRIED WINGATES.
sub factoidCheck {
my @list = &searchTable("factoids", "factoid_key", "factoid_key", " #DEL#");
- my $stale = $param{'factoidDeleteDelay'}*60*60*24;
+ my $stale = ($param{'factoidDeleteDelay'} || 7)*60*60*24;
foreach (@list) {
my $age = &getFactInfo($_, "modified_time");
&ScheduleThis(1440, "factoidCheck") if (@_);
}
+sub dccStatus {
+ my $time = strftime("%H:%M", localtime(time()) );
+
+ return unless (scalar keys %{ $DCC{CHAT} });
+
+ foreach (keys %channels) {
+ &DCCBroadcast("[$time] $_: $users members ($chops chops), $bans bans","+o");
+ }
+
+ &ScheduleThis(10, "dccStatus") if (@_);
+}
+
sub schedulerSTUB {
&ScheduleThis(TIME_IN_MINUTES, "FUNCTION") if (@_);
}
+sub scheduleList {
+ ###
+ # custom:
+ # a - time == now.
+ # b - weird time.
+ ###
+
+ &DEBUG("sched:");
+ foreach (keys %{ $irc->{_queue} }) {
+ my $q = $_;
+
+ my $sched;
+ foreach (keys %sched) {
+ next unless ($q eq $sched{$_});
+ $sched = $_;
+ last;
+ }
+
+ my $time = $irc->{_queue}->{$q}->[0] - time();
+
+ if (defined $sched) {
+ &DEBUG(" $sched($q): ".&Time2String($time) );
+ } else {
+ &DEBUG(" NULL($q): ".&Time2String($time) );
+ }
+ }
+
+ &DEBUG("end of sList.");
+}
+
+sub getChanConfDefault {
+ my($what, $default, $chan) = @_;
+
+ if (exists $param{$what}) {
+ &DEBUG("backward-compat: found param{$what} instead.");
+ return $param{$what};
+ }
+
+ my $val = &getChanConf($what, $chan);
+ if (defined $val) {
+ return $val;
+ }
+ $param{$what} = $default;
+ &DEBUG("not configured; setting param{$what} = $default");
+ ### TODO: set some vars?
+ return $default;
+}
+
1;