# Text - Actual text.
###
+use vars qw($who);
+
package News;
sub Parse {
my($what) = @_;
$chan = undef;
+ $who = lc $::who;
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;
}
# todo: check if the channel exists aswell.
$chan = lc $1;
- if (!&::IsNickInChan($::who, $chan)) {
+ if (!&::IsNickInChan($who, $chan)) {
&::notice($::who, "sorry but you're not on $chan.");
return;
}
# 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;
}
- my $t = $::newsuser{$chan}{$::who};
+ my $t = $::newsuser{$chan}{$who};
if ($state) { # state = 1
if (defined $t and ($t == 0 or $t == -1)) {
&::notice($::who, "enabled notify.");
- delete $::newsuser{$chan}{$::who};
+ delete $::newsuser{$chan}{$who};
return;
}
&::notice($::who, "already enabled.");
} else { # state = 0
- my $x = $::newsuser{$chan}{$::who};
+ my $x = $::newsuser{$chan}{$who};
if (defined $x and ($x == 0 or $x == -1)) {
&::notice($::who, "notify already disabled");
return;
}
- $::newsuser{$chan}{$::who} = -1;
+ $::newsuser{$chan}{$who} = -1;
&::notice($::who, "notify is now disabled.");
}
} else {
- &::DEBUG("could not parse '$what'");
&::notice($::who, "unknown command: $what");
}
}
if (/^[\s\t]+(\S+):[\s\t]+(.*)$/) {
if (!defined $item) {
- &::DEBUG("!defined item, never happen!");
+ &::DEBUG("news: !defined item, never happen!");
next;
}
close NEWS;
my $cn = scalar(keys %::news);
- &::status("News: Read ".
+ &::status("News: read ".
$ci. &::fixPlural(" item", $ci). " for ".
$cn. &::fixPlural(" chan", $cn). ", ".
$cu. &::fixPlural(" user", $cu), " cache"
}
$what = $found[0];
- &::DEBUG("del: str: guessed what => $what");
+ &::DEBUG("news: del: str: guessed what => $what");
}
}
}
if (&::IsChanConf("newsKeepRead")) {
- my $x = $::newsuser{$chan}{$::who};
+ 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} }) {
- &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} };
- &::notice($::who, "|==== News for \002$chan\002: ($count items)");
+ &::msg($::who, "|==== News for \002$chan\002: ($count items)");
my $newest = 0;
+ my $expire = 0;
+ my $eno = 0;
foreach (keys %{ $::news{$chan} }) {
my $t = $::news{$chan}{$_}{Time};
+ my $e = $::news{$chan}{$_}{Expire};
$newest = $t if ($t > $newest);
+ if ($e > 1 and $e < $expire) {
+ $expire = $e;
+ $eno = &newsS2N($item);
+ }
}
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");
+
+ &DEBUG("list: expire = $expire");
+ &DEBUG("list: eno = $eno");
my $i = 1;
foreach ( &getNewsAll() ) {
my $subtopic = $_;
my $setby = $::news{$chan}{$subtopic}{Author};
+ my $chr = (exists $::News{$chan}{$subtopic}{Text}) ? "" : "*";
if (!defined $subtopic) {
- &::DEBUG("warn: subtopic == undef.");
+ &::DEBUG("news: warn: subtopic == undef.");
next;
}
# todo: show request stats aswell.
- &::notice($::who, sprintf("\002[\002%2d\002]\002 %s",
- $i, $subtopic));
+ &::msg($::who, sprintf("\002[\002%2d\002]\002%s %s",
+ $i, $chr, $subtopic));
$i++;
}
- &::notice($::who, "|= End of News.");
- &::notice($::who, "use 'news read <#>' or 'news read <keyword>'");
+ my $z = $::newsuser{$::who};
+ if (defined $z) {
+ &::DEBUG("cache $::who: $z");
+ } else {
+ &::DEBUG("cache: $::who doesn't have newscache set.");
+ }
+
+ &::msg($::who, "|= End of News.");
+ &::msg($::who, "use 'news read <#>' or 'news read <keyword>'");
}
sub read {
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};
sub set {
my($args) = @_;
- $args =~ /^(\S+)\s+(\S+)\s+(.*)$/;
- my($item, $what, $value) = ($1,$2,$3);
+ my($item, $what, $value);
+
+ $item = $1 if ($args =~ s/^(\S+)\s*//);
+ $what = $1 if ($args =~ s/^(\S+)\s*//);
+ $value = $args;
- &::DEBUG("set called.");
+ &::DEBUG("news: set called.");
if ($item eq "") {
&::help("news set");
return;
}
- &::DEBUG("item => '$item'.");
my $news = &getNewsItem($item);
if (!defined $news) {
}
# list all values for chan.
- if (!defined $what) {
- &::DEBUG("set: 1");
+ if (!defined $what or $what =~ /^\s*$/) {
+ &::msg($::who, "set: you didn't fill me on the arguments! (what and values)");
return;
}
}
# show (read) what.
- if (!defined $value) {
- &::DEBUG("set: 2");
+ if (!defined $value or $value =~ /^\s*$/) {
+ &::msg($::who, "set: you didn't fill me on the arguments! (value)");
return;
}
}
if (!$time or ($value and $value !~ /^never$/i)) {
- &::DEBUG("set: Expire... need to parse.");
+ &::DEBUG("news: set: Expire... need to parse.");
+ &::msg($::who, "hrm... couldn't parse that.");
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) {
- &::DEBUG("hrm... time() > $time, should expire.");
+ &::DEBUG("news: hrm... time() > $time, should expire.");
}
}
}
my $auth = 0;
- &::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) {
- &::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++;
# 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'.");
sub latest {
my($tchan, $flag) = @_;
- $chan ||= $tchan; # hack hack hack.
+ # hack hack hack.
+ $chan ||= $tchan;
+ $who = $::who;
# todo: if chan = undefined, guess.
- if (!exists $::news{$chan}) {
- &::notice($::who, "invalid chan $chan") if ($flag);
+# if (!exists $::news{$chan}) {
+ if (!exists $::channels{$chan}) {
+ &::notice($who, "invalid chan $chan") if ($flag);
return;
}
- my $t = $::newsuser{$chan}{$::who};
+ my $t = $::newsuser{$chan}{$who};
+ if (defined $t) {
+ &::DEBUG("newsuser: $chan/$who == $t");
+ } else {
+ &::DEBUG("newsuser: $chan/$who == undefined");
+ }
+
if (defined $t and ($t == 0 or $t == -1)) {
if ($flag) {
- &::notice($::who, "if you want to read news, try /msg $::ident news or /msg $::ident news notify");
+ &::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");
return;
}
}
+ $::chan = $chan;
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");
- &::notice($::who, "something went really wrong.");
+ &::DEBUG("news: something went really wrong.");
+ &::DEBUG("news: chan => $chan, ::chan => $::chan");
+# &::notice($who, "something went really wrong.");
return;
}
# !scalar @new, $flag
if (!scalar @new and $flag) {
- &::notice($::who, "no new news for $chan.");
+ &::notice($who, "no new news for $chan for $who.");
+ # valid to set this?
+ $::newsuser{$chan}{$who} = time();
return;
}
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);
+ &::notice($who, $reply);
return;
}
# scalar @new, $flag
if (scalar @new) {
- &::notice($::who, "+==== New news for \002$chan\002 ($unread new; $total total):");
+ &::notice($who, "+==== New news for \002$chan\002 ($unread new; $total total):");
- my $t = $::newsuser{$chan}{$::who};
+ my $t = $::newsuser{$chan}{$who};
if (defined $t and $t > 1) {
my $timestr = &::Time2String( time() - $t );
- &::notice($::who, "|= Last time read $timestr ago");
+ &::notice($who, "|= Last time read $timestr ago");
}
my @sorted;
next unless (defined $news);
my $age = time() - $::news{$chan}{$news}{Time};
- &::notice($::who, sprintf("\002[\002%2d\002]\002 %s",
+ &::notice($who, sprintf("\002[\002%2d\002]\002 %s",
$i, $news) );
# $i, $_, &::Time2String($age) ) );
}
- &::notice($::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};
+ 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();
+ $::newsuser{$chan}{$who} = time();
}
}
}
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;
}
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;
}
foreach (sort { $a <=> $b } keys %time) {
$item++;
# $no = $item if ($time{$_} eq $what);
- if ($time{$_} eq $what) {
- $no = $item;
- next;
- }
+## if ($time{$_} eq $what) {
+## $no = $item;
+## next;
+## }
push(@items, $time{$_}) if ($time{$_} =~ /\Q$what\E/i);
}
- if (defined $no and !@items) {
- &::DEBUG("string->number resolution: $what->$no.");
- return $no;
- }
+## if (defined $no and !@items) {
+## &::DEBUG("news: string->number resolution: $what->$no.");
+## 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) {
- &::DEBUG("gNI: part_string->full_string: $what->$items[0]");
+ &::DEBUG("news: gNI: part_string->full_string: $what->$items[0]");
return $items[0];
} else {
- &::DEBUG("gNI: No match for '$what'");
+ &::DEBUG("news: gNI: No match for '$what'");
return;
}
}
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*$/) {
- &::DEBUG("what $what is not defined.");
+ &::DEBUG("news: what $what is not defined.");
return;
}
+
if (!defined $value or $value =~ /^\s*$/) {
- &::DEBUG("value $value is not defined.");
+ &::DEBUG("news: value $value is not defined.");
return;
}
- &::DEBUG("do_set: TODO...");
+ &::DEBUG("news: do_set: TODO...");
}
sub stats {
my $t = time();
foreach $chan (keys %::newsuser) {
$i += $t - $::newsuser{$chan}{$_};
+ &::DEBUG(" i = $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");
$i = $j = 0;
}
projects / infobot.git / blobdiff