- added support/hack for channel +o as "+o" in bot user file.

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index f4cb80904acb802a5ecc3809a2fc04180ef3a75c..2e2dc643fa8ffd1229e9a4e0aee1e23e89fdb99b 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -5,8 +5,7 @@
 #      Created: 20000107
 #
 
-if (&IsParam("useStrict")) { use strict; }
-
+#use strict;
 use vars qw($message $arg $qWord $verb $lobotomized);
 use vars qw(%channels %chanstats %cmdstats);
 
@@ -160,7 +159,8 @@ sub chaninfo {
        $new{$_} = $userstats{$_}{'Count'};
     }
 
-    my($count) = (sort { $a <=> $b } keys %new)[0];
+    # 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";
     }
@@ -219,7 +219,8 @@ sub factstats {
 
 sub karma {
     my $target = lc( shift || $who );
-    my $karma  = &dbGet("stats", "counter", "nick='$target' and type='karma'") || 0;
+    my $karma  = &dbGet("stats", "counter", "nick=".
+                       &dbQuote($target)." AND type='karma'") || 0; 
 
     if ($karma != 0) {
        &pSReply("$target has karma of $karma");
@@ -231,7 +232,7 @@ sub karma {
 sub ispell {
     my $query = shift;
 
-    if (! -x "/usr/bin/spell") {
+    if (! -x "/usr/bin/ispell") {
        &msg($who, "no binary found.");
        return;
     }
@@ -261,6 +262,9 @@ sub ispell {
        } elsif (/^\+/) {
            &DEBUG("spell: '+' found => '$_'.");
            last;
+       } elsif (/^# (.*?) 0$/) {
+           # none found.
+           last;
        } else {
            &DEBUG("spell: unknown: '$_'.");
        }
@@ -391,9 +395,14 @@ sub DNS {
     my $pid;
     $dns =~ s/^\s+|\s+$//g;
 
+    if (!defined $dns or $dns =~ /^\s*$/ or $dns =~ / /) {
+       &help("dns");
+       return;
+    }
+
     if ($dns =~ /(\d+\.\d+\.\d+\.\d+)/) {
-       &status("DNS query by IP address: $in");
        $match = $1;
+       &status("DNS query by IP address: $match");
 
        $y = pack('C4', split(/\./, $match));
        $x = (gethostbyaddr($y, &AF_INET));
@@ -434,7 +443,7 @@ sub countryStats {
        return;
     }
 
-    &rawout("WHO $chan");
+    $conn->who($chan);
     $cache{countryStats}{chan} = $chan;
     $cache{countryStats}{mtype}        = $msgType;
     $cache{countryStats}{who}  = $who;
@@ -602,6 +611,17 @@ sub userCommands {
        return;
     }
 
+    # reload.
+    if ($message =~ /^reload$/i) {
+       return unless (&hasFlag("n"));
+
+       &status("USER reload $who");
+       &pSReply("reloading...");
+       &reloadAllModules();
+       &pSReply("reloaded.");
+       return;
+    }
+
     # redir.
     if ($message =~ /^redir(\s+(.*))?/i) {
        return unless (&hasFlag("o"));
@@ -692,19 +712,28 @@ sub userCommands {
        my $raw_perc2   = $cpu_usage2*100/$time;
        my $perc;
        my $perc2;
+       my $total;
+       my $ratio;
 
        if ($raw_perc > 1) {
            $perc       = sprintf("%.01f", $raw_perc);
            $perc2      = sprintf("%.01f", $raw_perc2);
+           $total      = sprintf("%.01f", $raw_perc+$raw_perc2);
        } elsif ($raw_perc > 0.1) {
            $perc       = sprintf("%.02f", $raw_perc);
            $perc2      = sprintf("%.02f", $raw_perc2);
+           $total      = sprintf("%.02f", $raw_perc+$raw_perc2);
        } else {                        # <=0.1
            $perc       = sprintf("%.03f", $raw_perc);
            $perc2      = sprintf("%.03f", $raw_perc2);
+           $total      = sprintf("%.03f", $raw_perc+$raw_perc2);
        }
+       $ratio  = sprintf("%.01f", 100*$perc/($perc+$perc2) );
 
-       &pSReply("Total CPU usage: $cpu_usage s ... Percentage CPU used: $perc % (+childs: $perc2 %)");
+       &pSReply("Total CPU usage: \002$cpu_usage\002 s ... ".
+               "Total used: \002$total\002 % ".
+               "(parent/child ratio: $ratio %)"
+       );
 
        return;
     }
@@ -762,6 +791,7 @@ sub userCommands {
        my $startString = scalar(localtime $^T);
        my $upString    = &Time2String(time() - $^T);
        my $count       = &countKeys("factoids");
+
        $count{'Commands'}      = 0;
        foreach (keys %cmdstats) {
            $count{'Commands'} += $cmdstats{$_};
@@ -785,6 +815,19 @@ sub userCommands {
          "kB of memory."
        );
 
+       # todo: make dbGetColNiceHash().
+       my %hash = &dbGetCol("stats", "nick,counter", "type='cmdstats'".
+#                      " ORDER BY counter DESC LIMIT 3", 1);
+                       " ORDER BY counter DESC", 1);
+
+       foreach (keys %hash) {
+           my $i = $_;
+           foreach (keys %{ $hash{$i} }) {
+               &DEBUG("cmdstats: $hash{$i}{$_} = $_");
+           }
+       }
+       &DEBUG("end of cmdstats.");
+
        return;
     }
 
@@ -793,6 +836,8 @@ sub userCommands {
        if ($param{'ircNick'} eq $ident) {
            &msg($who, "I hope you're right. I'll try anyway.");
        }
+       &DEBUG("ircNick => $param{'ircNick'}");
+       &DEBUG("ident => $ident");
 
        if (! &IsNickInAnyChan( $param{ircNick} ) ) {
            my $str = "attempting to change nick to $param{'ircNick'}";
@@ -800,8 +845,9 @@ sub userCommands {
            &msg($who, $str);
            &nick($param{'ircNick'});
        } else {
-           &msg($who, "hrm... can't do it");
+           &msg($who, "hrm.. I shouldn't do it (BUG?) but doing it anyway!");
            &DEBUG("wN: nick is somewhere... should try later.");
+           &nick($param{'ircNick'});
        }
 
        return;