- don't list _default in chanstats

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 50f00e6a22584d83602a43c8d257eb8a736ed9a3..cfd15aa1f509ae1c116f247e9e64dece494e91b3 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -63,9 +63,12 @@ sub chaninfo {
                &ircCheck();
                next;
            }
-           push(@array, "$_ (".scalar(keys %{ $channels{$_}{''} }).")");
+           next if (/^_default$/);
+
+           my $str = sprintf("%s (%d)", $_, scalar(keys %{ $channels{$_}{''} }));
+           push(@array, $str);
        }
-       &pSReply($reply.": ".join(' ', @array));
+       &pSReply($reply.": ".join(', ', @array));
 
        ### total user count.
        foreach $chan (keys %channels) {
@@ -81,7 +84,7 @@ sub chaninfo {
                push(@nicks, $_);
            }
        }
-       &DEBUG("nicks => '".scalar(@nicks)."'...");
+
        if (scalar @nicks != $uucount) {
            &DEBUG("nicks != uucount...");
        }
@@ -221,8 +224,8 @@ sub factstats {
 
 sub karma {
     my $target = lc( shift || $who );
-    my $karma  = &dbGet("stats", "counter", "nick=".
-                       &dbQuote($target)." AND type='karma'") || 0; 
+    my $karma  = &sqlSelect("stats", "counter",
+       { nick => $target, type => "karma" }) || 0; 
 
     if ($karma != 0) {
        &pSReply("$target has karma of $karma");
@@ -790,9 +793,9 @@ sub userCommands {
 
     # status.
     if ($message =~ /^statu?s$/i) {
-       my $startString = scalar(localtime $^T);
+       my $startString = scalar(gmtime $^T);
        my $upString    = &Time2String(time() - $^T);
-       my $count       = &countKeys("factoids");
+       my $factoids    = &countKeys("factoids");
 
        $count{'Commands'}      = 0;
        foreach (keys %cmdstats) {
@@ -803,24 +806,26 @@ sub userCommands {
        "Since $startString, there have been".
          " \002$count{'Update'}\002 ".
                &fixPlural("modification", $count{'Update'}).
-         " and \002$count{'Question'}\002 ".
+         ", \002$count{'Question'}\002 ".
                &fixPlural("question",$count{'Question'}).
-         " and \002$count{'Dunno'}\002 ".
+         ", \002$count{'Dunno'}\002 ".
                &fixPlural("dunno",$count{'Dunno'}).
-         " and \002$count{'Moron'}\002 ".
+         ", \002$count{'Moron'}\002 ".
                &fixPlural("moron",$count{'Moron'}).
          " and \002$count{'Commands'}\002 ".
                &fixPlural("command",$count{'Commands'}).
          ".  I have been awake for $upString this session, and ".
-         "currently reference \002$count\002 factoids.  ".
+         "currently reference \002$factoids\002 factoids.  ".
          "I'm using about \002$memusage\002 ".
          "kB of memory."
        );
 
-       # todo: use dbGetColNiceHash().
-       my %hash = &dbGetCol("stats", "nick,counter", "type='cmdstats'".
-#                      " ORDER BY counter DESC LIMIT 3", 1);
-                       " ORDER BY counter DESC", 1);
+       return;
+
+       my %hash = &sqlSelectColHash("stats", "nick,counter",
+               { type => "cmdstats" }, 1);
+# ORDER won't be retained in a hash
+#                      " ORDER BY counter DESC", 1);
 
 if (0) {
        foreach (keys %hash) {