ws

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

diff --git a/src/Modules/News.pl b/src/Modules/News.pl
index 54e5591fc9098fb77a9e097f6feb87b86ee57816..caee5f104751e0fab85324b543997dfecb8f4292 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";
            }
@@ -283,11 +287,11 @@ sub add {
 
     my $agestr = &::Time2String($::news{$chan}{$str}{Expire} - time() );
     my $item   = &newsS2N($str);
-    &::notice($who, "Added '\037$str\037' at [".localtime(time).
+    &::notice($who, "Added '\037$str\037' at [".gmtime(time).
                "] by \002$::who\002 for item #\002$item\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] "
+       gmtime($::news{$chan}{$str}{Expire})."\002 [$agestr from now] "
     );
 
     &writeNews();
@@ -363,7 +367,7 @@ sub del {
 
 sub list {
     if (!scalar keys %{ $::news{$chan} }) {
-       &::notice($who, "No News for \002$chan\002.");
+       &::notice($who, "No news for \002$chan\002.");
        return;
     }
 
@@ -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);
@@ -440,7 +446,7 @@ sub read {
     }
 
     if (!scalar keys %{ $::news{$chan} }) {
-       &::notice($who, "No News for \002$chan\002.");
+       &::notice($who, "No news for \002$chan\002.");
        return;
     }
 
@@ -464,7 +470,7 @@ sub read {
        return;
     }
 
-    my $t      = localtime( $::news{$chan}{$item}{Time} );
+    my $t      = gmtime( $::news{$chan}{$item}{Time} );
     my $a      = $::news{$chan}{$item}{Author};
     my $text   = $::news{$chan}{$item}{Text};
     my $num    = &newsS2N($item);
@@ -486,7 +492,7 @@ sub read {
     my $e;
     if ($_) {
        $e = sprintf("\037%s\037  [%s from now]",
-               scalar(localtime($_)),
+               scalar(gmtime($_)),
                &::Time2String($_ - time())
        );
     }
@@ -536,7 +542,7 @@ sub mod {
        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);
        }
@@ -674,7 +680,7 @@ sub set {
            return;
        } else {
            &::notice($who, "Set expire for \002$item\002, to ".
-               localtime($time) ." [".&::Time2String($time - time())."]" );
+               gmtime($time) ." [".&::Time2String($time - time())."]" );
 
            if (time() > $time) {
                &::DEBUG("news: hrm... time() > $time, should expire.");
@@ -715,11 +721,11 @@ sub set {
 }
 
 sub latest {
-    my($tchan, $flag) = @_;
+    my ($tchan, $flag) = @_;
 
-    # hack hack hack.
-    $chan ||= $tchan;
-    $who    = $::who;
+    # hack hack hack.  fix later.
+    $chan = $tchan;
+    $who  = $::who;
 
     # todo: if chan = undefined, guess.
 #    if (!exists $::news{$chan}) {
@@ -746,14 +752,14 @@ sub latest {
 
     $::chan    = $chan;
     my $x = &::IsChanConf("newsNotifyAll");
-    if (&::IsChanConf("newsNotifyAll") and !defined $t) {
-       $t = 1;
-    }
+    return if (!$x);
+
+    # I don't understand this code ;)
+    $t = 1 if (!defined $t);
 
     if (!defined $t) {
-       &::DEBUG("news: something went really wrong.");
-       &::DEBUG("news: chan => $chan, ::chan => $::chan");
-#      &::notice($who, "something went really wrong.");
+#      &::msg($who, "News is disabled for $chan");
+       &::DEBUG("news: $chan: something went really wrong.");
        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;
        }
@@ -818,16 +831,16 @@ sub latest {
            $i   = &newsS2N($_);
            $sorted[$i] = $_;
        }
-       
+
        for ($i=0; $i<=scalar(@sorted); $i++) {
            my $news = $sorted[$i];
            next unless (defined $news);
 
-           my $age = time() - $::news{$chan}{$news}{Time};
+#          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, sprintf("\002[\002%2d\002]\002 %s",
-                       $i, $news) );
-#                      $i, $_, &::Time2String($age) ) );
+               &::notice($who, $msg);
            } );
        }
 
@@ -895,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};