- try and not kill ourself :)

[infobot.git] / src / UserExtra.pl

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 23b287394c8e260a79a77333d52f9725d8b87f5b..aaf37c488f42ec5a6dbae2fa2311d659474b4681 100644 (file)
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -5,10 +5,11 @@
 #      Created: 20000107
 #
 
-if (&IsParam("useStrict")) { use strict; }
-
-use vars qw($message $arg $qWord $verb $lobotomized);
-use vars qw(%channels %chanstats %cmdstats);
+use strict;
+use vars qw($message $arg $qWord $verb $lobotomized $who $result $chan
+       $conn $msgType $query $talkchannel $ident $memusage);
+use vars qw(%channels %chanstats %cmdstats %count %ircstats %param
+       %cache %mask %userstats %hooks_main);
 
 ###
 ### Start of command hooks for UserExtra.
@@ -19,7 +20,7 @@ use vars qw(%channels %chanstats %cmdstats);
 &addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo', 
        'Cmdstats' => 'Factoid Info', Module => 'factoids', ) );
 &addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', 
-       'Cmdstats' => 'Factoid Statistics', Help => "factstats", 
+       'Cmdstats' => 'Factoid Stats', Help => "factstats", 
        Forker => 1, 'Identifier' => 'factoids', ) );
 &addCmdHook("main", 'help', ('CODEREF' => 'help', 
        'Cmdstats' => 'Help', ) );
@@ -62,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) {
@@ -80,7 +84,7 @@ sub chaninfo {
                push(@nicks, $_);
            }
        }
-       &DEBUG("nicks => '".scalar(@nicks)."'...");
+
        if (scalar @nicks != $uucount) {
            &DEBUG("nicks != uucount...");
        }
@@ -220,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");
@@ -233,7 +237,7 @@ sub karma {
 sub ispell {
     my $query = shift;
 
-    if (! -x "/usr/bin/spell") {
+    if (! -x "/usr/bin/ispell") {
        &msg($who, "no binary found.");
        return;
     }
@@ -348,7 +352,7 @@ sub tell {
     $who               = $oldwho;
 
     # no such factoid.
-    if ($result =~ /^0?$/) {
+    if (!defined $result || $result =~ /^0?$/) {
        $who            = $target;
        $msgType        = "private";
 
@@ -444,7 +448,7 @@ sub countryStats {
        return;
     }
 
-    &rawout("WHO $chan");
+    $conn->who($chan);
     $cache{countryStats}{chan} = $chan;
     $cache{countryStats}{mtype}        = $msgType;
     $cache{countryStats}{who}  = $who;
@@ -612,6 +616,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"));
@@ -778,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) {
@@ -791,25 +806,28 @@ 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: make 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) {
            my $i = $_;
            foreach (keys %{ $hash{$i} }) {
@@ -817,26 +835,38 @@ sub userCommands {
            }
        }
        &DEBUG("end of cmdstats.");
+}
 
        return;
     }
 
     # wantNick. xk++
     if ($message =~ /^wantNick$/i) {
+       # cannot trust Net::IRC's nick()
        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} ) ) {
+       # fallback check, I guess.  needed?
+       if (! &IsNickInAnyChan( $param{'ircNick'} ) ) {
            my $str = "attempting to change nick to $param{'ircNick'}";
            &status($str);
            &msg($who, $str);
-           &nick($param{'ircNick'});
-       } else {
-           &msg($who, "hrm... can't do it");
-           &DEBUG("wN: nick is somewhere... should try later.");
+           &nick($param{ 'ircNick' });
+           return;
        }
 
+       # idea from dondelecarlo :)
+       if ($param{'ircNick'} ne $ident and $param{'nickServ_pass'}) {
+           &status("someone is using our nick; KILLing");
+           &msg("NickServ", "GHOST $param{'ircNick'} $param{'nickServ_pass'}");
+           return;
+       }
+
+       &nick( $param{'ircNick'} );
+
        return;
     }