Many changes, basically added and integrated News, and bug fixes.

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index e0c234a4cadc3580cb1e05503e77bc18af88b8ef..56c3ccfcc4902c6407195934dd8efd0de36c44b9 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -31,7 +31,7 @@ use vars qw(%channels %chanstats %cmdstats);
        Forker => "NULL", ) );
 &addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell', 
        Help => 'tell', Identifier => 'allowTelling', ) );
-
+&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse', ) );
 
 &status("CMD: loaded ".scalar(keys %hooks_main)." MAIN command hooks.");
 
@@ -75,6 +75,10 @@ sub chaninfo {
                push(@nicks, $_);
            }
        }
+       &DEBUG("nicks => '".scalar(@nicks)."'...");
+       if (scalar @nicks != $uucount) {
+           &DEBUG("nicks != uucount...");
+       }
 
        my $chans = scalar(keys %channels);
        &pSReply(
@@ -616,17 +620,31 @@ sub userCommands {
     }
 
     # ircstats.
-    if ($message =~ /^ircstats$/i) {
+    if ($message =~ /^ircstats?$/i) {
+       $ircstats{'TotalTime'}  ||= 0;
+       $ircstats{'OffTime'}    ||= 0;
+
        my $count       = $ircstats{'ConnectCount'};
        my $format_time = &Time2String(time() - $ircstats{'ConnectTime'});
-       my $total_time  = time() - $ircstats{'ConnectTime'} + $ircstats{'TotalTime'};
+       my $total_time  = time() - $ircstats{'ConnectTime'} +
+                               $ircstats{'TotalTime'};
        my $reply;
 
-       &DEBUG("ircstats: total_time => $total_time.");
-       &DEBUG("ircstats: offtime => $ircstats{'OffTime'}");
+       my $connectivity = 100 * ($total_time - $ircstats{'OffTime'}) /
+                               $total_time;
+       my $p = sprintf("%.02f", $connectivity);
+       $p =~ s/(\.\d*)0+$/$1/;
+       if ($p =~ s/\.0$//) {
+           &DEBUG("p sar not working properly :(");
+       } else {
+           $p =~ s/\.$//
+       }
+
+       &DEBUG("connectivity => $p %");
 
-       foreach (keys %ircstats) {
-           &DEBUG("ircstats: $_ => '$ircstats{$_}'.");
+       if ($total_time != (time() - $ircstats{'ConnectTime'}) ) {
+           my $tt_format = &Time2String($total_time);
+           &DEBUG("tt_format => $tt_format");
        }
 
        ### RECONNECT COUNT.