fix death

[infobot.git] / src / CommandStubs.pl

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 32e1005733da8c0b3312cdd8d5ded63b4f465716..8d48eac309cceb6cde2635eebbcce5dc7c3f21bf 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -3,7 +3,15 @@
 # WARN: this file does not reload on HUP.
 #
 
-#use strict;
+# use strict;  # TODO
+
+use vars qw($who $msgType $conn $chan $message $ident $talkchannel
+       $bot_version $babel_lang_regex $bot_data_dir);
+use vars qw(@vernick @vernicktodo);
+use vars qw(%channels %cache %mask %userstats %myModules %cmdstats
+       %hooks_extra %lang %ver);
+# FIX THE FOLLOWING:
+use vars qw($total $x $type $i $good);
 
 $babel_lang_regex = "fr|sp|es|po|pt|it|ge|de|gr|en|zh|ja|jp|ko|kr|ru";
 
@@ -120,7 +128,7 @@ sub parseCmdHook {
 
            # check if CODEREF exists.
            if (!defined &{ $hash{'CODEREF'} }) {
-               &WARN("coderef $hash{'CODEREF'} don't exist.");
+               &WARN("coderef $hash{'CODEREF'} does not exist.");
                if (defined $who) {
                    &msg($who, "coderef does not exist for $ident.");
                }
@@ -220,7 +228,7 @@ sub parseCmdHook {
 &addCmdHook("extra", 'verstats', ('CODEREF' => 'do_verstats' ) );
 &addCmdHook("extra", 'weather', ('CODEREF' => 'Weather::Weather',
        'Identifier' => 'weather', 'Help' => 'weather',
-       'Cmdstats' => 'Weather') );
+       'Cmdstats' => 'weather', 'Forker' => 1) );
 &addCmdHook("extra", 'bzflist', ('CODEREF' => 'BZFlag::list',
        'Identifier' => 'bzflag', 'Cmdstats' => 'BZFlag',
        'Forker' => 1) );
@@ -230,9 +238,17 @@ sub parseCmdHook {
 &addCmdHook("extra", 'zfi', ('CODEREF' => 'zfi::query',
        'Identifier' => 'zfi', 'Cmdstats' => 'zfi',
        'Forker' => 1) );
+&addCmdHook("extra", '(zippy|yow)', ('CODEREF' => 'zippy::get',
+       'Identifier' => 'zippy', 'Cmdstats' => 'zippy',
+       'Forker' => 1) );
 &addCmdHook("extra", 'zsi', ('CODEREF' => 'zsi::query',
        'Identifier' => 'zsi', 'Cmdstats' => 'zsi',
        'Forker' => 1) );
+&addCmdHook("extra", '(ex)?change', ('CODEREF' => 'Exchange::query',
+       'Identifier' => 'exchange', 'Cmdstats' => 'exchange',
+       'Forker' => 1) );
+&addCmdHook("extra", 'botmail', ('CODEREF' => 'botmail::parse',
+       'Identifier' => 'botmail', 'Cmdstats' => 'botmail') );
 
 ###
 ### END OF ADDING HOOKS.
@@ -399,7 +415,6 @@ sub Modules {
        my $args        = $3 || "";
 
        $thiscmd        =~ s/^vals$/values/;
-#      $args           =~ s/\s+$//g;
        return if ($thiscmd ne "keys" && $thiscmd ne "values");
 
        # Usage:
@@ -474,7 +489,7 @@ sub Modules {
            $percentage = "off the scale";
        } else {
            $percentage = sprintf("%0.4f", $percentage);
-           $percentage =~ s/\.?0+$//;
+           $percentage =~ s/(\.\d+)0+$/$1/;
            $percentage .= '%';
        }
 
@@ -590,11 +605,6 @@ sub seen {
     my($person) = lc shift;
     $person =~ s/\?*$//;
 
-    if (&whatInterface() !~ /IRC/) {
-       &status("seen disabled in CLI.");
-       return;
-    }
-
     if (!defined $person or $person =~ /^$/) {
        &help("seen");
 
@@ -695,8 +705,8 @@ sub cookie {
     ### TODO: convert this to a Forker function!
     if ($arg) {
        my @list = &searchTable("factoids", "factoid_key", "factoid_value", $arg);
-       $key  = &getRandom(@list);
-       $val  = &getFactInfo("factoids", $key, "factoid_value");
+       $key    = &getRandom(@list);
+       $value  = &getFactInfo($key, "factoid_value");
     } else {
        ($key,$value) = &randKey("factoids","factoid_key,factoid_value");
     }
@@ -825,7 +835,7 @@ sub do_verstats {
        return;
     }
 
-    &msg($who, "Sending CTCP VERSION to #$chan...");
+    &msg($who, "Sending CTCP VERSION to $chan; results in 60s.");
     $conn->ctcp("VERSION", $chan);
     $cache{verstats}{chan}     = $chan;
     $cache{verstats}{who}      = $who;
@@ -879,6 +889,8 @@ sub do_verstats {
            }
        }
 
+       # hack. this is one major downside to scheduling.
+       $chan = $c;
        &pSReply( &formListReply(0, "IRC Client versions for $c ", @list) );
 
        # clean up not-needed data structures.
@@ -947,23 +959,29 @@ sub textstats_main {
     } else {
        my %hash = &dbGetCol("stats", "type,counter",
                "$where AND nick=".&dbQuote($arg) );
+       # this is totally fucked... needs to be fixed... and cleaned up.
+       my $total;
+       my $good;
+       my $ii;
+       my $x;
 
        foreach (keys %hash) {
            &DEBUG("_stats: hash{$_} => $hash{$_}");
            # ranking.
            my @array = &dbGet("stats", "nick",
                $where." ORDER BY counter", 1);
-           my $good = 0;
-           my $i = 0;
-           for($i=0; $i<scalar @array; $i++) {
+           $good = 0;
+           $ii = 0;
+           for(my $i=0; $i<scalar @array; $i++) {
                next unless ($array[0] =~ /^\Q$who\E$/);
                $good++;
                last;
            }
-           $i++;
+           $ii++;
 
-           my $total = scalar(@array);
+           $total = scalar(@array);
            &DEBUG("   i => $i, good => $good, total => $total");
+           $x .= " ".$total."blah blah";
        }
 
        return;
@@ -975,8 +993,8 @@ sub textstats_main {
 
        my $xtra = "";
        if ($total and $good) {
-           my $pct = sprintf("%.01f", 100*(1+$total-$i)/$total);
-           $xtra = ", ranked $i\002/\002$total (percentile: \002$pct\002 %)";
+           my $pct = sprintf("%.01f", 100*(1+$total-$ii)/$total);
+           $xtra = ", ranked $ii\002/\002$total (percentile: \002$pct\002 %)";
        }
 
        my $pct1 = sprintf("%.01f", 100*$x/$sum);