- removed IsNickInAnyChan() for 'tell'.
- CTCP VERSION now returns correct version (cvs or release)
- don't use eval for factoid arguments since "next" cannot be done.
- prevent endless while loop for factoid arguments
- on_join: run netsplitCheck/chanlimitCheck if !%netsplit
- on_quit: run fe on possible chans to remove limits. enough?
- minor changes to logging output text
- fixed "news #CHAN latest"
- news: changed notice() to msg() to see if OPN reacts nicely.
git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@487
c11ca15a-4712-0410-83d8-
924469b57eb5
- eval {
- next unless ($query[0] =~ /^$arg$/i);
+ # todo: make eval work with $$i's :(
+# next unless (eval { $query[0] =~ /^$arg$/i });
+ next unless ($query[0] =~ /^$arg$/i);
+
+ if ($@) { # it failed!!!
+ &WARN("factargs: regex failed! '$query[0]' =~ /^$_\$/");
+ next;
+ }
for ($i=1; $i<=5; $i++) {
$val = $$i;
for ($i=1; $i<=5; $i++) {
$val = $$i;
- if ($@) { # it failed!!!
- &WARN("factargs: regex failed! '$query[0]' =~ /^$_\$/");
- next;
- }
&status("Question: factoid Arguments for '$query[0]'");
# todo: use getReply() - need to modify it :(
&status("Question: factoid Arguments for '$query[0]'");
# todo: use getReply() - need to modify it :(
+ # factoid arguments handler.
if (&IsChanConf("factoidArguments") and $lhs =~ /\$/) {
&status("Update: Factoid Arguments found.");
&status("Update: orig lhs => '$lhs'.");
&status("Update: orig rhs => '$rhs'.");
if (&IsChanConf("factoidArguments") and $lhs =~ /\$/) {
&status("Update: Factoid Arguments found.");
&status("Update: orig lhs => '$lhs'.");
&status("Update: orig rhs => '$rhs'.");
+ my $count = 0;
+ $lhs =~ s/^/CMD: /;
while ($lhs =~ s/\$(\S+)/(.*?)/) {
push(@list, "\$$1");
while ($lhs =~ s/\$(\S+)/(.*?)/) {
push(@list, "\$$1");
+ $count++;
+ last if ($count >= 10);
+
+ if ($count >= 10) {
+ &msg($who, "error: could not SAR properly.");
+ &DEBUG("error: lhs => '$lhs'.");
+ &DEBUG("error: rhs => '$rhs'.");
+ return;
+ }
+
my $z = join(',',@list);
$rhs =~ s/^/($z): /;
my $z = join(',',@list);
$rhs =~ s/^/($z): /;
if (exists $netsplit{lc $who}) {
delete $netsplit{lc $who};
$netsplit = 1;
if (exists $netsplit{lc $who}) {
delete $netsplit{lc $who};
$netsplit = 1;
- &netsplitCheck() if (time() != $sched{netsplitCheck}{TIME});
+ if (!scalar keys %netsplit) {
+ &DEBUG("on_join: netsplit hash is now empty!");
+ undef %netsplitservers;
+ &netsplitCheck(); # any point in running this?
+ &chanlimitCheck();
+ }
}
if ($netsplit and !exists $cache{netsplit}) {
}
if ($netsplit and !exists $cache{netsplit}) {
$reason = "NETSPLIT: $1 <=> $2";
# chanlimit code.
$reason = "NETSPLIT: $1 <=> $2";
# chanlimit code.
- if (&ChanConfList("chanlimitcheck") and !scalar keys %netsplit) {
- &DEBUG("on_quit: netsplit detected on $chan; disabling chan limit.");
- &rawout("MODE $chan -l");
+ if (!scalar keys %netsplit) {
+ my @l = &getNickInChans($nick);
+ &DEBUG("on_quit: l => ".scalar(@l) );
+
+ foreach ( &getNickInChans($nick) ) {
+ next unless ( &IsChanConf("chanlimitcheck") );
+ next unless ( exists $channels{$_}{'l'} );
+
+ &status("on_quit: netsplit detected on $_; disabling chan limit.");
+ &rawout("MODE $_ -l");
+ }
}
$netsplit{lc $nick} = time();
}
$netsplit{lc $nick} = time();
}
if ($delete or $duser) {
}
if ($delete or $duser) {
- &DEBUG("newsF: Writing news.");
- &status("NEWS (newsflush) deleted: $delete news entries; $duser user cache.");
+ &status("NewsFlush: deleted: $delete news entries; $duser user cache.");
$cache{'netsplitCache'}++;
&DEBUG("running netsplitCheck... $cache{netsplitCache}");
$cache{'netsplitCache'}++;
&DEBUG("running netsplitCheck... $cache{netsplitCache}");
+ if (!scalar %netsplit and scalar %netsplitservers) {
+ &DEBUG("nsc: FIRST!!! ok hash netsplit is NULL; purging hash netsplitservers");
+ undef %netsplitservers;
+ }
+
foreach $s1 (keys %netsplitservers) {
foreach $s1 (keys %netsplitservers) {
- &DEBUG("nsC: s1 => $s1");
foreach $s2 (keys %{ $netsplitservers{$s1} }) {
my $delta = time() - $netsplitservers{$s1}{$s2};
foreach $s2 (keys %{ $netsplitservers{$s1} }) {
my $delta = time() - $netsplitservers{$s1}{$s2};
- &DEBUG("nss{$s1}{$s2} = $delta");
- if (time() - $netsplitservers{$s1}{$s2} > 3600) {
&status("netsplit between $s1 and $s2 appears to be stale.");
delete $netsplitservers{$s1}{$s2};
&chanlimitCheck();
&status("netsplit between $s1 and $s2 appears to be stale.");
delete $netsplitservers{$s1}{$s2};
&chanlimitCheck();
# %netsplit hash checker.
my $count = scalar keys %netsplit;
# %netsplit hash checker.
my $count = scalar keys %netsplit;
foreach (keys %netsplit) {
if (&IsNickInAnyChan($_)) {
&DEBUG("netsplitC: $_ is in some chan; removing from netsplit list.");
delete $netsplit{$_};
next;
}
foreach (keys %netsplit) {
if (&IsNickInAnyChan($_)) {
&DEBUG("netsplitC: $_ is in some chan; removing from netsplit list.");
delete $netsplit{$_};
next;
}
- next unless (time() - $netsplit{$_} > 60*10);
+ # todo: change time value?
+ next unless (time() - $netsplit{$_} > 60*30);
- &DEBUG("netsplitC: $_ didn't come back from netsplit; removing from netsplit list.");
+ &DEBUG("removed from netsplit list (".scalar(@delete)."): @delete") if (@delete);
&DEBUG("nsC: netsplitservers: ".scalar(keys %netsplitservers) );
&DEBUG("nsC: netsplit: ".scalar(keys %netsplit) );
if (!scalar %netsplit and scalar %netsplitservers) {
&DEBUG("nsC: netsplitservers: ".scalar(keys %netsplitservers) );
&DEBUG("nsC: netsplit: ".scalar(keys %netsplit) );
if (!scalar %netsplit and scalar %netsplitservers) {
- &DEBUG("ok hash netsplit is NULL; purging hash netsplitservers");
+ &DEBUG("nsc: ok hash netsplit is NULL; purging hash netsplitservers");
undef %netsplitservers;
}
undef %netsplitservers;
}
&DEBUG("seenFlush: NO VALID FACTOID SUPPORT?");
}
&DEBUG("seenFlush: NO VALID FACTOID SUPPORT?");
}
- &status("Flushed $flushed seen entries.") if ($flushed);
+ &status("Seen: Flushed $flushed entries.") if ($flushed);
&VERB(sprintf(" new seen: %03.01f%% (%d/%d)",
$stats{'new'}*100/($stats{'count_old'} || 1),
$stats{'new'}, ( $stats{'count_old'} || 1) ), 2) if ($stats{'new'});
&VERB(sprintf(" new seen: %03.01f%% (%d/%d)",
$stats{'new'}*100/($stats{'count_old'} || 1),
$stats{'new'}, ( $stats{'count_old'} || 1) ), 2) if ($stats{'new'});
- if (defined $logMsg and $locMsg ne $message) {
+ if (defined $locMsg and $locMsg ne $message) {
+ # success.
if (!keys %::news) {
if (!exists $::cache{newsFirst}) {
if (!keys %::news) {
if (!exists $::cache{newsFirst}) {
- &::DEBUG("looks like we enabled news option just then; loading up news file just in case.");
+ &::DEBUG("news: looks like we enabled news option just then; loading up news file just in case.");
$::cache{newsFirst} = 1;
}
$::cache{newsFirst} = 1;
}
- &::VERB("Guessed $::who being on chan $chan",2);
+ &::DEBUG("Guessed $::who being on chan $chan",2);
$::chan = $chan; # hack for IsChanConf().
}
$::chan = $chan; # hack for IsChanConf().
}
# todo: don't notify even if "news" is called.
if (!&::IsChanConf("newsNotifyAll")) {
# todo: don't notify even if "news" is called.
if (!&::IsChanConf("newsNotifyAll")) {
- &::DEBUG("chan => $chan, ::chan => $::chan.");
+ &::DEBUG("news: chan => $chan, ::chan => $::chan.");
&::notice($::who, "not available for this channel or disabled altogether.");
return;
}
&::notice($::who, "not available for this channel or disabled altogether.");
return;
}
- &::DEBUG("could not parse '$what'");
+ &::DEBUG("news: could not parse '$what'");
&::notice($::who, "unknown command: $what");
}
}
&::notice($::who, "unknown command: $what");
}
}
if (/^[\s\t]+(\S+):[\s\t]+(.*)$/) {
if (!defined $item) {
if (/^[\s\t]+(\S+):[\s\t]+(.*)$/) {
if (!defined $item) {
- &::DEBUG("!defined item, never happen!");
+ &::DEBUG("news: !defined item, never happen!");
- &::DEBUG("del: str: guessed what => $what");
+ &::DEBUG("news: del: str: guessed what => $what");
my $x = $::newsuser{$chan}{$::who};
if (defined $x and ($x == 0 or $x == -1)) {
my $x = $::newsuser{$chan}{$::who};
if (defined $x and ($x == 0 or $x == -1)) {
- &::DEBUG("not updating time for $::who.");
+ &::DEBUG("news: not updating time for $::who.");
} else {
if (!scalar keys %{ $::news{$chan} }) {
} else {
if (!scalar keys %{ $::news{$chan} }) {
- &DEBUG("news: should not add $chan/$::who to cache!");
+ &::DEBUG("news: should not add $chan/$::who to cache!");
}
$::newsuser{$chan}{$::who} = time();
}
}
}
$::newsuser{$chan}{$::who} = time();
}
}
+ # ¬ice() breaks OPN :( - using msg() instead!
my $count = scalar keys %{ $::news{$chan} };
my $count = scalar keys %{ $::news{$chan} };
- &::notice($::who, "|==== News for \002$chan\002: ($count items)");
+ &::msg($::who, "|==== News for \002$chan\002: ($count items)");
my $newest = 0;
foreach (keys %{ $::news{$chan} }) {
my $t = $::news{$chan}{$_}{Time};
$newest = $t if ($t > $newest);
}
my $timestr = &::Time2String(time() - $newest);
my $newest = 0;
foreach (keys %{ $::news{$chan} }) {
my $t = $::news{$chan}{$_}{Time};
$newest = $t if ($t > $newest);
}
my $timestr = &::Time2String(time() - $newest);
- &::notice($::who, "|= Last updated $timestr ago.");
- &::notice($::who, " \037Num\037 \037Item ".(" "x40)." \037");
+ &::msg($::who, "|= Last updated $timestr ago.");
+ &::msg($::who, " \037Num\037 \037Item ".(" "x40)." \037");
my $i = 1;
foreach ( &getNewsAll() ) {
my $i = 1;
foreach ( &getNewsAll() ) {
my $setby = $::news{$chan}{$subtopic}{Author};
if (!defined $subtopic) {
my $setby = $::news{$chan}{$subtopic}{Author};
if (!defined $subtopic) {
- &::DEBUG("warn: subtopic == undef.");
+ &::DEBUG("news: warn: subtopic == undef.");
next;
}
# todo: show request stats aswell.
next;
}
# todo: show request stats aswell.
- &::notice($::who, sprintf("\002[\002%2d\002]\002 %s",
+ &::msg($::who, sprintf("\002[\002%2d\002]\002 %s",
- &::notice($::who, "|= End of News.");
- &::notice($::who, "use 'news read <#>' or 'news read <keyword>'");
+ &::msg($::who, "|= End of News.");
+ &::msg($::who, "use 'news read <#>' or 'news read <keyword>'");
my $news = &getNewsItem($item);
if (!defined $news) {
my $news = &getNewsItem($item);
if (!defined $news) {
- &::DEBUG("error: mod: news == undefined.");
+ &::DEBUG("news: error: mod: news == undefined.");
return;
}
my $nnews = $::news{$chan}{$news}{Text};
return;
}
my $nnews = $::news{$chan}{$news}{Text};
$args =~ /^(\S+)\s+(\S+)\s+(.*)$/;
my($item, $what, $value) = ($1,$2,$3);
$args =~ /^(\S+)\s+(\S+)\s+(.*)$/;
my($item, $what, $value) = ($1,$2,$3);
- &::DEBUG("set called.");
+ &::DEBUG("news: set called.");
if ($item eq "") {
&::help("news set");
return;
}
if ($item eq "") {
&::help("news set");
return;
}
- &::DEBUG("item => '$item'.");
+ &::DEBUG("news: set: item => '$item'.");
my $news = &getNewsItem($item);
if (!defined $news) {
my $news = &getNewsItem($item);
if (!defined $news) {
# list all values for chan.
if (!defined $what) {
# list all values for chan.
if (!defined $what) {
+ &::DEBUG("news: set: 1");
# show (read) what.
if (!defined $value) {
# show (read) what.
if (!defined $value) {
+ &::DEBUG("news: set: 2");
}
if (!$time or ($value and $value !~ /^never$/i)) {
}
if (!$time or ($value and $value !~ /^never$/i)) {
- &::DEBUG("set: Expire... need to parse.");
+ &::DEBUG("news: set: Expire... need to parse.");
return;
}
if ($time == -1) {
&::notice($::who, "Set never expire for \002$item\002." );
} elsif ($time < -1) {
return;
}
if ($time == -1) {
&::notice($::who, "Set never expire for \002$item\002." );
} elsif ($time < -1) {
- &::DEBUG("time should never be negative ($time).");
+ &::DEBUG("news: time should never be negative ($time).");
return;
} else {
&::notice($::who, "Set expire for \002$item\002, to ".
localtime($time) ." [".&::Time2String($time - time())."]" );
if (time() > $time) {
return;
} else {
&::notice($::who, "Set expire for \002$item\002, to ".
localtime($time) ." [".&::Time2String($time - time())."]" );
if (time() > $time) {
- &::DEBUG("hrm... time() > $time, should expire.");
+ &::DEBUG("news: hrm... time() > $time, should expire.");
- &::DEBUG("who => '$::who'");
+ &::DEBUG("news: who => '$::who'");
my $author = $::news{$chan}{$news}{Author};
$auth++ if ($::who eq $author);
$auth++ if (&::IsFlag("o"));
if (!defined $author) {
my $author = $::news{$chan}{$news}{Author};
$auth++ if ($::who eq $author);
$auth++ if (&::IsFlag("o"));
if (!defined $author) {
- &::DEBUG("news{$chan}{$news}{Author} is not defined! auth'd anyway");
+ &::DEBUG("news: news{$chan}{$news}{Author} is not defined! auth'd anyway");
$::news{$chan}{$news}{Author} = $::who;
$author = $::who;
$auth++;
$::news{$chan}{$news}{Author} = $::who;
$author = $::who;
$auth++;
# todo: clean this up.
my $old = $::news{$chan}{$news}{$what};
if (defined $old) {
# todo: clean this up.
my $old = $::news{$chan}{$news}{$what};
if (defined $old) {
- &::DEBUG("old => $old.");
+ &::DEBUG("news: old => $old.");
}
$::news{$chan}{$news}{$what} = $value;
&::notice($::who, "Setting [$chan]/{$news}/<$what> to '$value'.");
}
$::news{$chan}{$news}{$what} = $value;
&::notice($::who, "Setting [$chan]/{$news}/<$what> to '$value'.");
$chan ||= $tchan; # hack hack hack.
# todo: if chan = undefined, guess.
$chan ||= $tchan; # hack hack hack.
# todo: if chan = undefined, guess.
- if (!exists $::news{$chan}) {
+# if (!exists $::news{$chan}) {
+ if (!exists $::channels{$chan}) {
&::notice($::who, "invalid chan $chan") if ($flag);
return;
}
&::notice($::who, "invalid chan $chan") if ($flag);
return;
}
if ($flag) {
&::notice($::who, "if you want to read news, try /msg $::ident news or /msg $::ident news notify");
} else {
if ($flag) {
&::notice($::who, "if you want to read news, try /msg $::ident news or /msg $::ident news notify");
} else {
- &::DEBUG("not displaying any new news for $::who");
+ &::DEBUG("news: not displaying any new news for $::who");
my $x = &::IsChanConf("newsNotifyAll");
if (&::IsChanConf("newsNotifyAll") and !defined $t) {
$t = 1;
}
if (!defined $t) {
my $x = &::IsChanConf("newsNotifyAll");
if (&::IsChanConf("newsNotifyAll") and !defined $t) {
$t = 1;
}
if (!defined $t) {
- &::DEBUG("something went really wrong.");
- &::DEBUG("chan => $chan, ::chan => $::chan");
+ &::DEBUG("news: something went really wrong.");
+ &::DEBUG("news: chan => $chan, ::chan => $::chan");
&::notice($::who, "something went really wrong.");
return;
}
&::notice($::who, "something went really wrong.");
return;
}
# lame hack to prevent dupes if we just ignore it.
my $x = $::newsuser{$chan}{$::who};
if (defined $x and ($x == 0 or $x == -1)) {
# lame hack to prevent dupes if we just ignore it.
my $x = $::newsuser{$chan}{$::who};
if (defined $x and ($x == 0 or $x == -1)) {
- &::DEBUG("not updating time for $::who. (2)");
+ &::DEBUG("news: not updating time for $::who. (2)");
} else {
$::newsuser{$chan}{$::who} = time();
}
} else {
$::newsuser{$chan}{$::who} = time();
}
my $t = $::news{$chan}{$_}{Time};
if (!defined $t or $t !~ /^\d+$/) {
my $t = $::news{$chan}{$_}{Time};
if (!defined $t or $t !~ /^\d+$/) {
- &::DEBUG("warn: t is undefined for news{$chan}{$_}{Time}; removing item.");
+ &::DEBUG("news: warn: t is undefined for news{$chan}{$_}{Time}; removing item.");
delete $::news{$chan}{$_};
next;
}
delete $::news{$chan}{$_};
next;
}
my $t = $::news{$chan}{$_}{Time};
if (!defined $t or $t !~ /^\d+$/) {
my $t = $::news{$chan}{$_}{Time};
if (!defined $t or $t !~ /^\d+$/) {
- &::DEBUG("warn: t is undefined for news{$chan}{$_}{Time}; removing item.");
+ &::DEBUG("news: warn: t is undefined for news{$chan}{$_}{Time}; removing item.");
delete $::news{$chan}{$_};
next;
}
delete $::news{$chan}{$_};
next;
}
}
if (defined $no and !@items) {
}
if (defined $no and !@items) {
- &::DEBUG("string->number resolution: $what->$no.");
+ &::DEBUG("news: string->number resolution: $what->$no.");
return $no;
}
if (scalar @items > 1) {
return $no;
}
if (scalar @items > 1) {
- &::DEBUG("Multiple matches, not guessing.");
+ &::DEBUG("news: Multiple matches, not guessing.");
&::notice($::who, "Multiple matches, not guessing.");
return;
}
if (@items) {
&::notice($::who, "Multiple matches, not guessing.");
return;
}
if (@items) {
- &::DEBUG("gNI: part_string->full_string: $what->$items[0]");
+ &::DEBUG("news: gNI: part_string->full_string: $what->$items[0]");
return $items[0];
} else {
return $items[0];
} else {
- &::DEBUG("gNI: No match for '$what'");
+ &::DEBUG("news: gNI: No match for '$what'");
my($what,$value) = @_;
if (!defined $chan) {
my($what,$value) = @_;
if (!defined $chan) {
- &::DEBUG("do_set: chan not defined.");
+ &::DEBUG("news: do_set: chan not defined.");
return;
}
if (!defined $what or $what =~ /^\s*$/) {
return;
}
if (!defined $what or $what =~ /^\s*$/) {
- &::DEBUG("what $what is not defined.");
+ &::DEBUG("news: what $what is not defined.");
if (!defined $value or $value =~ /^\s*$/) {
if (!defined $value or $value =~ /^\s*$/) {
- &::DEBUG("value $value is not defined.");
+ &::DEBUG("news: value $value is not defined.");
- &::DEBUG("do_set: TODO...");
+ &::DEBUG("news: do_set: TODO...");
$j++;
}
&::DEBUG("news: stats: average latest time read: total time: $i");
$j++;
}
&::DEBUG("news: stats: average latest time read: total time: $i");
- &::DEBUG("... count: $j");
- &::DEBUG(" average: ".sprintf("%.02f", $i/($j||1))." sec/user");
+ &::DEBUG("news: ... count: $j");
+ &::DEBUG("news: average: ".sprintf("%.02f", $i/($j||1))." sec/user");
if (length $message > 64) {
&status("unparseable-moron: $message");
if (length $message > 64) {
&status("unparseable-moron: $message");
- &performReply( &getRandom(keys %{ $lang{'moron'} }) );
+# &performReply( &getRandom(keys %{ $lang{'moron'} }) );
+
+ &performReply("You are moron #".$count{'Moron'}."!");
&status("tell: target = $target, query = $query");
# "intrusive".
&status("tell: target = $target, query = $query");
# "intrusive".
- if ($target !~ /^$mask{chan}$/ and !&IsNickInAnyChan($target)) {
+# if ($target !~ /^$mask{chan}$/ and !&IsNickInAnyChan($target)) {
+ if ($target !~ /^$mask{chan}$/) {
&msg($who, "No, $target is not in any of my chans.");
return;
}
&msg($who, "No, $target is not in any of my chans.");
return;
}
- ### TODO: don't "tell" if sender is not in target's channel.
-
# self.
if ($target eq $ident) { # lc?
&msg($who, "Isn't that a bit silly?");
# self.
if ($target eq $ident) { # lc?
&msg($who, "Isn't that a bit silly?");
# dynamic scalar. MUST BE REDUCED IN SIZE!!!
### TODO: reorder.
use vars qw(
# dynamic scalar. MUST BE REDUCED IN SIZE!!!
### TODO: reorder.
use vars qw(
- $answer $correction_plausible $talkchannel
+ $answer $correction_plausible $talkchannel $bot_release
$statcount $memusage $user $memusageOld $bot_version $dbh
$shm $host $msg $bot_misc_dir $bot_pid $bot_base_dir $noreply
$bot_src_dir $conn $irc $learnok $nick $ident $no_syscall
$statcount $memusage $user $memusageOld $bot_version $dbh
$shm $host $msg $bot_misc_dir $bot_pid $bot_base_dir $noreply
$bot_src_dir $conn $irc $learnok $nick $ident $no_syscall
$notsize = 0;
$notcount = $notsleep = 0;
###
$notsize = 0;
$notcount = $notsleep = 0;
###
-$bot_version = "blootbot cvs (20010214) -- $^O";
+if ( -d "CVS" ) {
+ use POSIX qw(strftime);
+ $bot_release = strftime("cvs (%Y%m%d)", localtime( (stat("CVS"))[9] ) );
+} else {
+ $bot_release = "1.0.10 (2001xxxx)";
+}
+$bot_version = "blootbot $bot_release -- $^O";
$noreply = "NOREPLY";
##########
$noreply = "NOREPLY";
##########
&status("Opened MySQL connection to $param{'SQLHost'}");
} else {
&ERROR("cannot connect to $param{'SQLHost'}.");
&status("Opened MySQL connection to $param{'SQLHost'}");
} else {
&ERROR("cannot connect to $param{'SQLHost'}.");
+ &ERROR("since mysql is not available, shutting down bot!");
&shutdown();
&closePID();
exit 1;
&shutdown();
&closePID();
exit 1;