&readNews();
}
- if ($::msgType ne "private") {
+ if ($::msgType ne 'private') {
$chan = $::chan;
}
} elsif ($what =~ /^(un)?notify$/i) {
my $state = ($1) ? 0 : 1;
- # TODO: don't notify even if "news" is called.
- if (!&::IsChanConf("newsNotifyAll")) {
+ # TODO: don't notify even if 'News' is called.
+ if (&::IsChanConf('newsNotifyAll') <= 0) {
&::DEBUG("news: chan => $chan, ::chan => $::chan.");
&::notice($who, "not available for this channel or disabled altogether.");
return;
} else { # state = 0
my $x = $::newsuser{$chan}{$who};
if (defined $x and ($x == 0 or $x == -1)) {
- &::notice($who, "notify already disabled");
+ &::notice($who, 'notify already disabled');
return;
}
$::newsuser{$chan}{$who} = -1;
}
sub readNews {
- my $file = "$::bot_base_dir/blootbot-news.txt";
+ my $file = "$::bot_base_dir/infobot-news.txt";
if (! -f $file or -z $file) {
return;
}
return unless ($ci or $cn or $cu);
&::status("News: read ".
- $ci. &::fixPlural(" item", $ci). " for ".
- $cn. &::fixPlural(" chan", $cn). ", ".
- $cu. &::fixPlural(" user", $cu), " cache"
+ $ci. &::fixPlural(' item', $ci). ' for '.
+ $cn. &::fixPlural(' chan', $cn). ', '.
+ $cu. &::fixPlural(' user', $cu), ' cache'
);
}
}
# should define this at the top of file.
- my $file = "$::bot_base_dir/blootbot-news.txt";
+ my $file = "$::bot_base_dir/infobot-news.txt";
if (fileno NEWS) {
&::ERROR("News: write: fileno NEWS exists, should never happen.");
}
# TODO: show how many users we wrote down.
- if (&::getChanConfList("newsKeepRead")) {
+ if (&::getChanConfList('newsKeepRead')) {
# old users are removed in newsFlush(), perhaps it should be
# done here.
my($str) = @_;
if (!defined $chan or !defined $str or $str =~ /^\s*$/) {
- &::help("news add");
+ &::help('news add');
return;
}
}
$::news{$chan}{$str}{Time} = time();
- my $expire = &::getChanConfDefault("newsDefaultExpire",7);
+ my $expire = &::getChanConfDefault('newsDefaultExpire',7, $chan);
$::news{$chan}{$str}{Expire} = time() + $expire*60*60*24;
$::news{$chan}{$str}{Author} = $::who; # case!
my $item = 0;
if (!defined $what) {
- &::help("news del");
+ &::help('news del');
return;
}
if (exists $::news{$chan}{$what}) {
my $auth = 0;
$auth++ if ($::who eq $::news{$chan}{$what}{Author});
- $auth++ if (&::IsFlag("o"));
+ $auth++ if (&::IsFlag('o'));
if (!$auth) {
# TODO: show when it'll expire.
return;
}
- if (&::IsChanConf("newsKeepRead")) {
+ if (&::IsChanConf('newsKeepRead') > 0) {
my $x = $::newsuser{$chan}{$who};
if (defined $x and ($x == 0 or $x == -1)) {
}
my $timestr = &::Time2String(time() - $newest);
&::msg($who, "|= Last updated $timestr ago.");
- &::msg($who, " \037Num\037 \037Item ".(" "x40)." \037");
+ &::msg($who, " \037Num\037 \037Item ".(' 'x40)." \037");
# &::DEBUG("news: list: expire = $expire");
# &::DEBUG("news: list: eno = $eno");
foreach ( &getNewsAll() ) {
my $subtopic = $_;
my $setby = $::news{$chan}{$subtopic}{Author};
- my $chr = (exists $::News{$chan}{$subtopic}{Text}) ? "" : "*";
+ my $chr = (exists $::News{$chan}{$subtopic}{Text}) ? '' : '*';
if (!defined $subtopic) {
&::DEBUG("news: warn: subtopic == undef.");
my($str) = @_;
if (!defined $chan or !defined $str or $str =~ /^\s*$/) {
- &::help("news read");
+ &::help('news read');
return;
}
}
if (!exists $::news{$chan}{$item}{Text}) {
- &::notice($who, "Someone forgot to add info to this news item");
+ &::notice($who, 'Someone forgot to add info to this news item');
return;
}
sub mod {
my($item, $str) = split /\s+/, $_[0], 2;
- if (!defined $item or $item eq "" or $str =~ /^\s*$/) {
- &::help("news mod");
+ if (!defined $item or $item eq '' or $str =~ /^\s*$/) {
+ &::help('news mod');
return;
}
# TODO: make code safer.
my $done = 0;
# TODO: use eval to deal with flags easily.
- if ($flags eq "") {
+ if ($flags eq '') {
$done++ if (!$done and $mod_news =~ s/\Q$op\E/$np/);
$done++ if (!$done and $mod_nnews =~ s/\Q$op\E/$np/);
- } elsif ($flags eq "g") {
+ } elsif ($flags eq 'g') {
$done++ if ($mod_news =~ s/\Q$op\E/$np/g);
$done++ if ($mod_nnews =~ s/\Q$op\E/$np/g);
}
$what = $1 if ($args =~ s/^(\S+)\s*//);
$value = $args;
- if ($item eq "") {
- &::help("news set");
+ if ($item eq '') {
+ &::help('news set');
return;
}
}
my $ok = 0;
- my @elements = ("Expire","Text");
+ my @elements = ('Expire','Text');
foreach (@elements) {
next unless ($what =~ /^$_$/i);
$what = $_;
return;
}
- if ($what eq "Expire") {
+ if ($what eq 'Expire') {
# TODO: use do_set().
my $time = 0;
# &::DEBUG("news: who => '$who'");
my $author = $::news{$chan}{$news}{Author};
$auth++ if ($::who eq $author);
- $auth++ if (&::IsFlag("o"));
+ $auth++ if (&::IsFlag('o'));
if (!defined $author) {
&::DEBUG("news: news{$chan}{$news}{Author} is not defined! auth'd anyway");
$::news{$chan}{$news}{Author} = $::who;
}
$::chan = $chan;
- my $x = &::IsChanConf("newsNotifyAll");
- return if (!$x);
+ return if (&::IsChanConf('newsNotifyAll') <= 0);
# I don't understand this code ;)
$t = 1 if (!defined $t);
# scalar @new, !$flag
my $unread = scalar @new;
my $total = scalar keys %{ $::news{$chan} };
- if (!$flag && !&::IsChanConf("newsTellUnread")) {
+ if (!$flag && &::IsChanConf('newsTellUnread') <= 0) {
return;
}