if (defined $what and $what =~ s/^($::mask{chan})\s*//) {
# todo: check if the channel exists aswell.
- $chan = $1;
+ $chan = lc $1;
+
+ if (!&::IsNickInChan($::who, $chan)) {
+ &::notice($::who, "sorry but you're not on $chan.");
+ return;
+ }
}
if (!defined $chan) {
- my @chans = &::GetNickInChans($::who);
+ my @chans = &::getNickInChans($::who);
if (scalar @chans > 1) {
- &::msg($::who, "error: I dunno which channel you are referring to since you're on more than one. Try 'news #chan ...' instead");
+ &::notice($::who, "error: I dunno which channel you are referring to since you're on more than one. Try 'news #chan ...' instead");
return;
}
if (scalar @chans == 0) {
- &::msg($::who, "error: I couldn't find you on any chan. This must be a bug!");
+ &::notice($::who, "error: I couldn't find you on any chan. This must be a bug!");
return;
}
$chan = $chans[0];
- &::DEBUG("Guessed $::who being on chan $chan");
+ &::VERB("Guessed $::who being on chan $chan",2);
$::chan = $chan; # hack for IsChanConf().
}
} elsif ($what =~ /^set(\s+(.*))?$/i) {
&set($2);
- } elsif ($what =~ /^(\d)$/i) {
- &::DEBUG("read shortcut called.");
+ } elsif ($what =~ /^(\d+)$/i) {
+ &::VERB("News: read shortcut called.",2);
&read($1);
} elsif ($what =~ /^read(\s+(.*))?$/i) {
} elsif ($what =~ /^(latest|new)(\s+(.*))?$/i) {
&latest($3 || $chan, 1);
+# $::cmdstats{'News latest'}++;
+
+ } elsif ($what =~ /^stats?$/i) {
+ &stats();
} elsif ($what =~ /^list$/i) {
- &::DEBUG("list longcut called.");
&list();
} elsif ($what =~ /^(expire|text|desc)(\s+(.*))?$/i) {
} elsif ($what =~ /^help(\s+(.*))?$/i) {
&::help("news$1");
+ } elsif ($what =~ /^newsflush$/i) {
+ &::msg($::who, "newsflush called... check out the logs!");
+ &::newsFlush();
+
} elsif ($what =~ /^(un)?notify$/i) {
my $state = ($1) ? 0 : 1;
# todo: don't notify even if "news" is called.
if (!&::IsChanConf("newsNotifyAll")) {
- &::msg($::who, "not available for this channel or disabled altogether.");
+ &::DEBUG("chan => $chan, ::chan => $::chan.");
+ &::notice($::who, "not available for this channel or disabled altogether.");
return;
}
my $t = $::newsuser{$chan}{$::who};
if ($state) { # state = 1
if (defined $t and ($t == 0 or $t == -1)) {
- &::msg($::who, "enabled notify.");
+ &::notice($::who, "enabled notify.");
delete $::newsuser{$chan}{$::who};
return;
}
- &::msg($::who, "already enabled.");
+ &::notice($::who, "already enabled.");
} else { # state = 0
my $x = $::newsuser{$chan}{$::who};
if (defined $x and ($x == 0 or $x == -1)) {
- &::msg($::who, "notify already disabled");
+ &::notice($::who, "notify already disabled");
return;
}
$::newsuser{$chan}{$::who} = -1;
- &::msg($::who, "notify is now disabled.");
+ &::notice($::who, "notify is now disabled.");
}
} else {
- &::DEBUG("could not parse '$what'.");
- &::msg($::who, "unknown command: $what");
+ &::DEBUG("could not parse '$what'");
+ &::notice($::who, "unknown command: $what");
}
}
sub readNews {
my $file = "$::bot_base_dir/blootbot-news.txt";
- if (! -f $file) {
+ if (! -f $file or -z $file) {
return;
}
}
close NEWS;
- &::status("News: Read $ci items for ".scalar(keys %::news)
- ." chans, $cu users cache");
+ my $cn = scalar(keys %::news);
+ &::status("News: Read ".
+ $ci. &::fixPlural(" item", $ci). " for ".
+ $cn. &::fixPlural(" chan", $cn). ", ".
+ $cu. &::fixPlural(" user", $cu), " cache"
+ ) if ($ci or $cn or $cu);
}
sub writeNews {
- if (!scalar keys %::news) {
- &::DEBUG("wN: nothing to write.");
+ if (!scalar keys %::news and !scalar keys %::newsuser) {
+ &::VERB("wN: nothing to write.",2);
return;
}
}
if (length $str > 64) {
- &::msg($::who, "That's not really an item (>64chars)");
+ &::notice($::who, "That's not really an item (>64chars)");
return;
}
if (exists $::news{$chan}{$str}{Time}) {
- &::msg($::who, "'$str' for $chan already exists!");
+ &::notice($::who, "'$str' for $chan already exists!");
return;
}
my $agestr = &::Time2String($::news{$chan}{$str}{Expire} - time() );
my $item = &newsS2N($str);
- &::msg($::who, "Added '\037$str\037' at [".localtime(time).
+ &::notice($::who, "Added '\037$str\037' at [".localtime(time).
"] by \002$::who\002 for item #\002$item\002.");
- &::msg($::who, "Now do 'news text $item <your_description>'");
- &::msg($::who, "This item will expire at \002".
+ &::notice($::who, "Now do 'news text $item <your_description>'");
+ &::notice($::who, "This item will expire at \002".
localtime($::news{$chan}{$str}{Expire})."\002 [$agestr from now] "
);
if ($what =~ /^\d+$/) {
my $count = scalar keys %{ $::news{$chan} };
if (!$count) {
- &::msg($::who, "No news for $chan.");
+ &::notice($::who, "No news for $chan.");
return;
}
if ($what > $count or $what < 0) {
- &::msg($::who, "$what is out of range (max $count)");
+ &::notice($::who, "$what is out of range (max $count)");
return;
}
}
if (!scalar @found) {
- &::msg($::who, "could not find $what.");
+ &::notice($::who, "could not find $what.");
return;
}
if (scalar @found > 1) {
- &::msg($::who, "too many matches for $what.");
+ &::notice($::who, "too many matches for $what.");
return;
}
if (!$auth) {
# todo: show when it'll expire.
- &::msg($::who, "Sorry, you cannot remove items; just let them expire on their own.");
+ &::notice($::who, "Sorry, you cannot remove items; just let them expire on their own.");
return;
}
- &::msg($::who, "ok, deleted '$what' from \002$chan\002...");
+ &::notice($::who, "ok, deleted '$what' from \002$chan\002...");
delete $::news{$chan}{$what};
} else {
- &::msg($::who, "error: not found $what in news for $chan.");
+ &::notice($::who, "error: not found $what in news for $chan.");
}
}
sub list {
if (!scalar keys %{ $::news{$chan} }) {
- &::msg($::who, "No News for \002$chan\002.");
+ &::notice($::who, "No News for \002$chan\002.");
return;
}
if (defined $x and ($x == 0 or $x == -1)) {
&::DEBUG("not updating time for $::who.");
} else {
+ if (!scalar keys %{ $::news{$chan} }) {
+ &DEBUG("news: should not add $chan/$::who to cache!");
+ }
+
$::newsuser{$chan}{$::who} = time();
}
}
- &::msg($::who, "|==== News for \002$chan\002:");
+ my $count = scalar keys %{ $::news{$chan} };
+ &::notice($::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);
- &::msg($::who, "|= Last updated $timestr ago.");
- &::msg($::who, " \037Num\037 \037Item ".(" "x40)." \037");
+ &::notice($::who, "|= Last updated $timestr ago.");
+ &::notice($::who, " \037Num\037 \037Item ".(" "x40)." \037");
my $i = 1;
foreach ( &getNewsAll() ) {
}
# todo: show request stats aswell.
- &::msg($::who, sprintf("\002[\002%2d\002]\002 %s",
+ &::notice($::who, sprintf("\002[\002%2d\002]\002 %s",
$i, $subtopic));
$i++;
}
- &::msg($::who, "|= End of News.");
- &::msg($::who, "use 'news read <#>' or 'news read <keyword>'");
+ &::notice($::who, "|= End of News.");
+ &::notice($::who, "use 'news read <#>' or 'news read <keyword>'");
}
sub read {
}
if (!scalar keys %{ $::news{$chan} }) {
- &::msg($::who, "No News for \002$chan\002.");
+ &::notice($::who, "No News for \002$chan\002.");
return;
}
my $item = &getNewsItem($str);
if (!defined $item or !scalar keys %{ $::news{$chan}{$item} }) {
- &::msg($::who, "No news item called '$str'");
+ &::notice($::who, "No news item called '$str'");
return;
}
if (!exists $::news{$chan}{$item}{Text}) {
- &::msg($::who, "Someone forgot to add info to this news item");
+ &::notice($::who, "Someone forgot to add info to this news item");
return;
}
my $rcount = $::news{$chan}{$item}{Request_Count} || 0;
if (length $text < $::param{maxKeySize}) {
- &::DEBUG("NEWS: Possible news->factoid redirection.");
+ &::VERB("NEWS: Possible news->factoid redirection.",2);
my $f = &::getFactoid($text);
if (defined $f) {
- &::DEBUG("NEWS: ok, $text is factoid redirection.");
+ &::VERB("NEWS: ok, $text is factoid redirection.",2);
$f =~ s/^<REPLY>\s*//i; # anything else?
$text = $f;
}
}
- &::msg($::who, "+- News \002$chan\002 #$num: \037$item\037");
- &::msg($::who, "| Added by $a at $t");
- &::msg($::who, "| Requested $rcount times, last by $rwho");
- &::msg($::who, $text);
+ $_ = $::news{$chan}{$item}{'Expire'};
+ my $e;
+ if ($_) {
+ $e = sprintf("\037%s\037 [%s from now]",
+ scalar(localtime($_)),
+ &::Time2String($_ - time())
+ );
+ }
+
+ &::notice($::who, "+- News \002$chan\002 #$num: $item");
+ &::notice($::who, "| Added by $a at \037$t\037");
+ &::notice($::who, "| Expire: $e") if (defined $e);
+ &::notice($::who, $text);
+ &::notice($::who, "| Requested \002$rcount\002 times, last by \002$rwho\002") if ($rcount and $rwho);
$::news{$chan}{$item}{'Request_By'} = $::who;
$::news{$chan}{$item}{'Request_Time'} = time();
my ($delim, $op, $np, $flags) = ($1,$2,$3,$4);
if ($flags !~ /^(g)?$/) {
- &::msg($::who, "error: Invalid flags to regex.");
+ &::notice($::who, "error: Invalid flags to regex.");
return;
}
}
if (!$done) {
- &::msg($::who, "warning: regex not found in news.");
+ &::notice($::who, "warning: regex not found in news.");
return;
}
if ($mod_news ne $news) { # news item.
if (exists $::news{$chan}{$mod_news}) {
- &::msg($::who, "item '$mod_news' already exists.");
+ &::notice($::who, "item '$mod_news' already exists.");
return;
}
- &::msg($::who, "Moving item '$news' to '$mod_news' with SAR s/$op/$np/.");
+ &::notice($::who, "Moving item '$news' to '$mod_news' with SAR s/$op/$np/.");
foreach (keys %{ $::news{$chan}{$news} }) {
$::news{$chan}{$mod_news}{$_} = $::news{$chan}{$news}{$_};
delete $::news{$chan}{$news}{$_};
}
if ($mod_nnews ne $nnews) { # news Text/Description.
- &::msg($::who, "Changing text for '$news' SAR s/$op/$np/.");
+ &::notice($::who, "Changing text for '$news' SAR s/$op/$np/.");
if ($mod_news ne $news) {
$::news{$chan}{$mod_news}{Text} = $mod_nnews;
} else {
return;
} else {
- &::msg($::who, "error: that regex failed ;(");
+ &::notice($::who, "error: that regex failed ;(");
return;
}
- &::msg($::who, "error: Invalid regex. Try s/1/2/, s#3#4#...");
+ &::notice($::who, "error: Invalid regex. Try s/1/2/, s#3#4#...");
}
sub set {
&::DEBUG("item => '$item'.");
my $news = &getNewsItem($item);
- &::DEBUG("news => '$news'");
if (!defined $news) {
- &::msg($::who, "Could not find item '$item' substring or # in news list.");
+ &::notice($::who, "Could not find item '$item' substring or # in news list.");
return;
}
}
if (!$ok) {
- &::msg($::who, "Invalid set. Try: @elements");
+ &::notice($::who, "Invalid set. Try: @elements");
return;
}
}
if (!exists $::news{$chan}{$news}) {
- &::msg($::who, "news '$news' does not exist");
+ &::notice($::who, "news '$news' does not exist");
return;
}
}
if ($time == -1) {
- &::msg($::who, "Set never expire for \002$item\002." );
+ &::notice($::who, "Set never expire for \002$item\002." );
} elsif ($time < -1) {
&::DEBUG("time should never be negative ($time).");
return;
} else {
- &::msg($::who, "Set expire for \002$item\002, to ".
+ &::notice($::who, "Set expire for \002$item\002, to ".
localtime($time) ." [".&::Time2String($time - time())."]" );
if (time() > $time) {
if (!$auth) {
# todo: show when it'll expire.
- &::msg($::who, "Sorry, you cannot set items. (author $author owns it)");
+ &::notice($::who, "Sorry, you cannot set items. (author $author owns it)");
return;
}
&::DEBUG("old => $old.");
}
$::news{$chan}{$news}{$what} = $value;
- &::msg($::who, "Setting [$chan]/{$news}/<$what> to '$value'.");
+ &::notice($::who, "Setting [$chan]/{$news}/<$what> to '$value'.");
}
sub latest {
# todo: if chan = undefined, guess.
if (!exists $::news{$chan}) {
- &::msg($::who, "invalid chan $chan");
+ &::notice($::who, "invalid chan $chan") if ($flag);
return;
}
my $t = $::newsuser{$chan}{$::who};
if (defined $t and ($t == 0 or $t == -1)) {
- &::DEBUG("not displaying any new news for $::who");
- return;
+ 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");
+ return;
+ }
}
+ my $x = &::IsChanConf("newsNotifyAll");
if (&::IsChanConf("newsNotifyAll") and !defined $t) {
-# $::newsuser{$chan}{$::who} = 1;
$t = 1;
}
if (!defined $t) {
&::DEBUG("something went really wrong.");
- &::msg($::who, "something went really wrong.");
+ &::DEBUG("chan => $chan, ::chan => $::chan");
+ &::notice($::who, "something went really wrong.");
return;
}
next if (!defined $t);
next if ($t > $::news{$chan}{$_}{Time});
+ # don't list new items if they don't have Text.
+ if (!exists $::news{$chan}{$_}{Text}) {
+ if (time() - $::news{$chan}{$_}{Time} > 60*60*24*3) {
+ &::DEBUG("deleting news{$chan}{$_} because it was too old and had no text info.");
+ delete $::news{$chan}{$_};
+ }
+
+ next;
+ }
+
push(@new, $_);
}
+ # !scalar @new, $flag
if (!scalar @new and $flag) {
- &::msg($::who, "no new news for $chan.");
+ &::notice($::who, "no new news for $chan.");
return;
}
+ # scalar @new, !$flag
+ my $unread = scalar @new;
+ my $total = scalar keys %{ $::news{$chan} };
if (!$flag) {
- my $unread = scalar @new;
- my $total = scalar keys %{ $::news{$chan} };
return unless ($unread);
- &::msg($::who, "There are unread news in $chan ($unread unread, $total total). /msg $::ident news latest. If you don't want further news notification, /msg $::ident news unnotify");
+ my $reply = "There are unread news in $chan ($unread unread, $total total). /msg $::ident news $::chan latest";
+ $reply .= " If you don't want further news notification, /msg $::ident news unnotify" if ($unread == $total);
+ &::notice($::who, $reply);
return;
}
+ # scalar @new, $flag
if (scalar @new) {
- &::msg($::who, "+==== New news for \002$chan\002 (".
- scalar(@new)." new items):");
+ &::notice($::who, "+==== New news for \002$chan\002 ($unread new; $total total):");
- if ($::newsuser{$chan}{$::who}) {
- my $timestr = &::Time2String( time() - $::newsuser{$chan}{$::who} );
- &::msg($::who, "|= Last time read $timestr ago");
+ my $t = $::newsuser{$chan}{$::who};
+ if (defined $t and $t > 1) {
+ my $timestr = &::Time2String( time() - $t );
+ &::notice($::who, "|= Last time read $timestr ago");
}
my @sorted;
next unless (defined $news);
my $age = time() - $::news{$chan}{$news}{Time};
- &::msg($::who, sprintf("\002[\002%2d\002]\002 %s",
+ &::notice($::who, sprintf("\002[\002%2d\002]\002 %s",
$i, $news) );
# $i, $_, &::Time2String($age) ) );
}
- &::msg($::who, "|= to read, do 'news read <#>' or 'news read <keyword>'");
+ &::notice($::who, "|= to read, do 'news read <#>' or 'news read <keyword>'");
# lame hack to prevent dupes if we just ignore it.
my $x = $::newsuser{$chan}{$::who};
if (scalar @items > 1) {
&::DEBUG("Multiple matches, not guessing.");
- &::msg($::who, "Multiple matches, not guessing.");
+ &::notice($::who, "Multiple matches, not guessing.");
return;
}
- &::DEBUG("gNI: part_string->full_string: $what->$items[0]");
if (@items) {
- &::DEBUG("gNI: Guessed '$items[0]'.");
+ &::DEBUG("gNI: part_string->full_string: $what->$items[0]");
return $items[0];
} else {
- &::DEBUG("gNI: No match.");
+ &::DEBUG("gNI: No match for '$what'");
return;
}
}
&::DEBUG("do_set: TODO...");
}
+sub stats {
+ &::DEBUG("News: stats called.");
+ &::msg($::who, "check my logs/console.");
+ my($i,$j) = (0,0);
+
+ # total request count.
+ foreach $chan (keys %::news) {
+ foreach (keys %{ $::news{$chan} }) {
+ $i += $::news{$chan}{$_}{Request_Count};
+ }
+ }
+ &::DEBUG("news: stats: total request count => $i");
+ $i = 0;
+
+ # total user cached.
+ foreach $chan (keys %::newsuser) {
+ $i += $::newsuser{$chan}{$_};
+ }
+ &::DEBUG("news: stats: total user cache => $i");
+ $i = 0;
+
+ # average latest time read.
+ my $t = time();
+ foreach $chan (keys %::newsuser) {
+ $i += $t - $::newsuser{$chan}{$_};
+ $j++;
+ }
+ &::DEBUG("news: stats: average latest time read: total time: $i");
+ &::DEBUG("... count: $j");
+ &::DEBUG(" average: ".sprintf("%.02f", $i/($j||1))." sec/user");
+ $i = $j = 0;
+}
+
1;