- strictify

[infobot.git] / src / Modules / News.pl

diff --git a/src/Modules/News.pl b/src/Modules/News.pl
index 478c86104b8782e96101a4fc76278c8bb04baa16..1c1629d8f91ddce4f384fa4c67acf9f02c8aba2c 100644 (file)
--- a/src/Modules/News.pl
+++ b/src/Modules/News.pl
@@ -15,10 +15,12 @@
 #      Text    - Actual text.
 ###
 
-use vars qw($who $chan);
-
 package News;
 
+use strict;
+
+use vars qw($who $chan);
+
 sub Parse {
     my($what)  = @_;
     $chan      = undef;
@@ -225,6 +227,7 @@ sub writeNews {
        $c = scalar keys %{ $::news{$chan} };
        next unless ($c);
        $cc++;
+       my $item;
 
        foreach $item (sort keys %{ $::news{$chan} }) {
            $c = scalar keys %{ $::news{$chan}{$item} };
@@ -232,6 +235,7 @@ sub writeNews {
            $ci++;
 
            print NEWS "$chan $item\n";
+           my $what;
            foreach $what (sort keys %{ $::news{$chan}{$item} }) {
                print NEWS "    $what: $::news{$chan}{$item}{$what}\n";
            }
@@ -393,7 +397,9 @@ sub list {
        $newest = $t if ($t > $newest);
        if ($e > 1 and $e < $expire) {
            $expire     = $e;
-           $eno        = &newsS2N($item);
+           &::DEBUG("before newsS2N($_)");
+           $eno        = &newsS2N($_);
+           &::DEBUG("after newsS2N($_) == $eno");
        }
     }
     my $timestr = &::Time2String(time() - $newest);
@@ -751,9 +757,9 @@ sub latest {
     }
 
     if (!defined $t) {
+#      &::msg($who, "News is disabled for $chan");
        &::DEBUG("news: something went really wrong.");
-       &::DEBUG("news: chan => $chan, ::chan => $::chan");
-#      &::notice($who, "something went really wrong.");
+       &::DEBUG("news: chan => $chan.");
        return;
     }
 
@@ -786,10 +792,17 @@ sub latest {
     # scalar @new, !$flag
     my $unread = scalar @new;
     my $total  = scalar keys %{ $::news{$chan} };
+    if (!$flag && !&::IsChanConf("newsTellUnread")) {
+       return;
+    }
+
     if (!$flag) {
        return unless ($unread);
 
-       if ($::cache{newsTime} - time() < 5) {
+       # just a temporary measure not to flood ourself off the 
+       # network with news until we get global notice() and msg()
+       # throttling.
+       if (time() - ($::cache{newsTime} || 0) < 5) {
            &::status("news: not displaying latest notice to $who/$chan.");
            return;
        }
@@ -812,23 +825,29 @@ sub latest {
            &::notice($who, "|= Last time read $timestr ago");
        }
 
+       my $i;
        my @sorted;
        foreach (@new) {
-           my $i   = &newsS2N($_);
+           $i   = &newsS2N($_);
            $sorted[$i] = $_;
        }
-
-       for (my $i=0; $i<=scalar(@sorted); $i++) {
+       
+       for ($i=0; $i<=scalar(@sorted); $i++) {
            my $news = $sorted[$i];
            next unless (defined $news);
 
-           my $age = time() - $::news{$chan}{$news}{Time};
-           &::notice($who, sprintf("\002[\002%2d\002]\002 %s",
-               $i, $news) );
-#              $i, $_, &::Time2String($age) ) );
+#          my $age = time() - $::news{$chan}{$news}{Time};
+           my $msg = sprintf("\002[\002%2d\002]\002 %s", $i, $news);
+###                    $i, $_, &::Time2String($age)
+           $::conn->schedule(int((2+$i)/2), sub {
+               &::notice($who, $msg);
+           } );
        }
 
-       &::notice($who, "|= to read, do \002news $chan read <#>\002 or \002news $chan read <keyword>\002");
+       # todo: implement throttling via schedule into &notice() / &msg().
+       $::conn->schedule(int((2+$i)/2), sub {
+           &::notice($who, "|= to read, do \002news $chan read <#>\002 or \002news $chan read <keyword>\002");
+       } );
 
        # lame hack to prevent dupes if we just ignore it.
        my $x = $::newsuser{$chan}{$who};
@@ -889,6 +908,8 @@ sub getNewsItem {
     my($what)  = @_;
     my $item   = 0;
 
+    $what =~ s/^\#//;  # '#1' for example.
+
     my %time;
     foreach (keys %{ $::news{$chan} }) {
        my $t = $::news{$chan}{$_}{Time};