direct addressing with multiple nicks

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 0292db704c167420d2bd8239847cc61a94a52e22..7c48244c215e59ad99315cff2a5997dd59fbec88 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -164,7 +164,7 @@ sub chaninfo {
        $new{$_} = $userstats{$_}{'Count'};
     }
 
-    # todo: show top 3 with percentages?
+    # TODO: show top 3 with percentages?
     my($count) = (sort { $new{$a} <=> $new{$b} } keys %new)[0];
     if ($count) {
        $reply .= ".  \002$count\002 has said the most with a total of \002$new{$count}\002 messages";
@@ -225,7 +225,7 @@ sub factstats {
 sub karma {
     my $target = lc( shift || $who );
     my $karma  = &sqlSelect("stats", "counter",
-       { nick => $target, type => "karma" }) || 0; 
+       { nick => $target, type => "karma" }) || 0;
 
     if ($karma != 0) {
        &pSReply("$target has karma of $karma");
@@ -330,7 +330,7 @@ sub tell {
     $target    = $talkchannel  if ($target =~ /^us$/i);
     $target    = $who          if ($target =~ /^(me|myself)$/i);
 
-    &status("tell: target = $target, query = $query");  
+    &status("tell: target = $target, query = $query");
 
     # "intrusive".
 #    if ($target !~ /^$mask{chan}$/ and !&IsNickInAnyChan($target)) {
@@ -416,7 +416,7 @@ sub DNS {
            $result = $match." is ".$x unless ($x =~ /^\s*$/);
        } else {
            $result = "I can't seem to find that address in DNS";
-        }
+       }
 
     } else {
 
@@ -486,7 +486,7 @@ sub do_countrystats {
        push(@list, "$str ($_, $perc %)");
     }
 
-    # todo: move this into a scheduler like nickometer
+    # TODO: move this into a scheduler like nickometer
     $msgType   = "private";
     &pSReply( &formListReply(0, "Country Stats ", @list) );
 
@@ -787,7 +787,7 @@ sub userCommands {
        }
 
        &pSReply($reply);
-               
+
        return;
     }
 
@@ -795,8 +795,13 @@ sub userCommands {
     if ($message =~ /^statu?s$/i) {
        my $startString = scalar(gmtime $^T);
        my $upString    = &Time2String(time() - $^T);
+       my ($puser,$psystem,$cuser,$csystem) = times;
        my $factoids    = &countKeys("factoids");
-
+       my $forks = 0;
+       foreach (keys %forked) {
+           $forks += scalar keys %{ $forked{$_} };
+       }
+       $forks /= 2;
        $count{'Commands'}      = 0;
        foreach (keys %cmdstats) {
            $count{'Commands'} += $cmdstats{$_};
@@ -817,7 +822,9 @@ sub userCommands {
          ".  I have been awake for $upString this session, and ".
          "currently reference \002$factoids\002 factoids.  ".
          "I'm using about \002$memusage\002 ".
-         "kB of memory."
+         "kB of memory. With \002$forks\002 active ".
+               &fixPlural("fork",$forks).
+         ". Process time user/system $puser/$psystem child $cuser/$csystem"
        );
 
        return;
@@ -845,7 +852,7 @@ if (0) {
        my ($force) = ($1) ? 1 : 0;
        $force = 0 unless (&IsFlag("n"));
 
-       # cannot trust Net::IRC's nick()
+       # cannot trust Net::IRC's nick() (TimRiker asks why?)
        if ($param{'ircNick'} eq $ident) {
            &msg($who, "I hope you're right. I'll try anyway.");
            &DEBUG("ircNick => $param{'ircNick'}");
@@ -862,7 +869,7 @@ if (0) {
        }
 
        # idea from dondelecarlo :)
-       # todo: use cache{nickserv}
+       # TODO: use cache{nickserv}
        if ($param{'nickServ_pass'}) {
            return if ($param{'ircNick'} eq $ident or $force == 0);