X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FUserExtra.pl;h=e38fa950b04a0495ff5fdadd765123d54564d028;hb=492eb2c99e1b47c2fb0c729cb9ff196a4081fcd9;hp=92bb19537093209d74ca076a65a90b50e52d80c2;hpb=83cee736a2e443dacceaec95a39c82994d9c6cda;p=infobot.git diff --git a/src/UserExtra.pl b/src/UserExtra.pl index 92bb195..e38fa95 100644 --- 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', ) ); @@ -33,7 +34,7 @@ use vars qw(%channels %chanstats %cmdstats); Help => 'tell', Identifier => 'allowTelling', Cmdstats => 'Tell') ); &addCmdHook("main", 'news', ('CODEREF' => 'News::Parse', - Module => 'news', ) ); + Module => 'news', 'Cmdstats' => 'News' ) ); &addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats', # Forker => "NULL", ) ); @@ -152,10 +153,16 @@ sub chaninfo { my %new; foreach (keys %userstats) { next unless (exists $userstats{$_}{'Count'}); + if ($userstats{$_}{'Count'} =~ /^\D+$/) { + &WARN("userstats{$_}{Count} is non-digit."); + next; + } + $new{$_} = $userstats{$_}{'Count'}; } - my($count) = (sort { $b <=> $a } 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"; } @@ -214,7 +221,8 @@ sub factstats { sub karma { my $target = lc( shift || $who ); - my $karma = &dbGet("karma", "nick",$target,"karma") || 0; + my $karma = &dbGet("stats", "counter", "nick=". + &dbQuote($target)." AND type='karma'") || 0; if ($karma != 0) { &pSReply("$target has karma of $karma"); @@ -226,7 +234,7 @@ sub karma { sub ispell { my $query = shift; - if (! -x "/usr/bin/spell") { + if (! -x "/usr/bin/ispell") { &msg($who, "no binary found."); return; } @@ -256,6 +264,9 @@ sub ispell { } elsif (/^\+/) { &DEBUG("spell: '+' found => '$_'."); last; + } elsif (/^# (.*?) 0$/) { + # none found. + last; } else { &DEBUG("spell: unknown: '$_'."); } @@ -282,7 +293,7 @@ sub tell { # this one catches most of them if ($args =~ /^(\S+) (-?)about (.*)$/i) { - $target = lc $1; + $target = $1; $tell_obj = $3; $dont_tell_me = ($2) ? 1 : 0; @@ -290,19 +301,19 @@ sub tell { $query = $tell_obj; } elsif ($args =~ /^(\S+) where (\S+) can (\S+) (.*)$/i) { # i'm sure this could all be nicely collapsed - $target = lc $1; + $target = $1; $tell_obj = $4; $query = $tell_obj; } elsif ($args =~ /^(\S+) (what|where) (.*?) (is|are)[.?!]*$/i) { - $target = lc $1; + $target = $1; $qWord = $2; $tell_obj = $3; $verb = $4; $query = "$qWord $verb $tell_obj"; } elsif ($args =~ /^(.*?) to (\S+)$/i) { - $target = lc $3; + $target = $3; $tell_obj = $2; $query = $tell_obj; } @@ -319,15 +330,13 @@ sub tell { &status("tell: target = $target, query = $query"); # "intrusive". - if ($target !~ /^$mask{chan}$/ and !&IsNickInAnyChan($target)) { - &msg($who, "No, $target is not in any of my chans."); - return; - } - - ### TODO: don't "tell" if sender is not in target's channel. +# if ($target !~ /^$mask{chan}$/ and !&IsNickInAnyChan($target)) { +# &msg($who, "No, $target is not in any of my chans."); +# return; +# } # self. - if ($target eq $ident) { # lc? + if ($target =~ /^\Q$ident\E$/i) { &msg($who, "Isn't that a bit silly?"); return; } @@ -340,7 +349,7 @@ sub tell { $who = $oldwho; # no such factoid. - if ($result =~ /^0?$/) { + if (!defined $result || $result =~ /^0?$/) { $who = $target; $msgType = "private"; @@ -352,7 +361,7 @@ sub tell { $message = $tell_obj; $done++ unless (&Modules()); - &DEBUG("setting old values of who and msgType."); + &VERB("tell: setting old values of who and msgType.",2); $who = $oldwho; $msgType = $oldmtype; @@ -386,10 +395,17 @@ sub DNS { my $dns = shift; my($match, $x, $y, $result); 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)); @@ -398,12 +414,14 @@ sub DNS { } else { $result = "I can't seem to find that address in DNS"; } + } else { - &status("DNS query by name: $in"); - $x = join('.',unpack('C4',(gethostbyname($in))[4])); + + &status("DNS query by name: $dns"); + $x = join('.',unpack('C4',(gethostbyname($dns))[4])); if ($x !~ /^\s*$/) { - $result = $in." is ".$x; + $result = $dns." is ".$x; } else { $result = "I can\'t find that machine name"; } @@ -427,7 +445,7 @@ sub countryStats { return; } - &rawout("WHO $chan"); + $conn->who($chan); $cache{countryStats}{chan} = $chan; $cache{countryStats}{mtype} = $msgType; $cache{countryStats}{who} = $who; @@ -595,6 +613,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")); @@ -678,21 +707,35 @@ sub userCommands { # utime(13) + stime(14). my $cpu_usage = sprintf("%.01f", ($data[13]+$data[14]) / 100 ); + # cutime(15) + cstime (16). + my $cpu_usage2 = sprintf("%.01f", ($data[15]+$data[16]) / 100 ); my $time = time() - $^T; my $raw_perc = $cpu_usage*100/$time; + 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 %"); - &DEBUG("15 => $data[15] (cutime)"); - &DEBUG("16 => $data[16] (cstime)"); + &pSReply("Total CPU usage: \002$cpu_usage\002 s ... ". + "Total used: \002$total\002 % ". + "(parent/child ratio: $ratio %)" + ); return; } @@ -747,9 +790,14 @@ 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) { + $count{'Commands'} += $cmdstats{$_}; + } &pSReply( "Since $startString, there have been". @@ -761,13 +809,33 @@ sub userCommands { &fixPlural("dunno",$count{'Dunno'}). " and \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." ); return; + + # todo: use dbGetColNiceHash(). + my %hash = &sqlSelectColHash("stats", "nick,counter", + { type => "cmdstats" }, 1); +# does ORDER matter when used with a hash? +# " ORDER BY counter DESC", 1); + +if (0) { + foreach (keys %hash) { + my $i = $_; + foreach (keys %{ $hash{$i} }) { + &DEBUG("cmdstats: $hash{$i}{$_} = $_"); + } + } + &DEBUG("end of cmdstats."); +} + + return; } # wantNick. xk++ @@ -775,6 +843,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'}"; @@ -782,8 +852,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;