X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FUserExtra.pl;h=ada60ce8113155e9c07a0e378c67793df0f403a1;hb=f7cae48a17d6decd0a9bd997188271daa0a885b1;hp=9a5fa42eb67e1daf36fcc2165f849e73b3954ec2;hpb=a8c0307437c9c3e2121c7b6f1b9ea9a89902b193;p=infobot.git diff --git a/src/UserExtra.pl b/src/UserExtra.pl index 9a5fa42..ada60ce 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. @@ -16,22 +17,27 @@ use vars qw(%channels %chanstats %cmdstats); &addCmdHook("main", 'chan(stats|info)', ('CODEREF' => 'chaninfo', ) ); &addCmdHook("main", 'cmd(stats|info)', ('CODEREF' => 'cmdstats', ) ); -&addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo', +&addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo', 'Cmdstats' => 'Factoid Info', Module => 'factoids', ) ); -&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', - 'Cmdstats' => 'Factoid Statistics', Help => "factstats", +&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', + 'Cmdstats' => 'Factoid Stats', Help => "factstats", Forker => 1, 'Identifier' => 'factoids', ) ); -&addCmdHook("main", 'help', ('CODEREF' => 'help', +&addCmdHook("main", 'help', ('CODEREF' => 'help', 'Cmdstats' => 'Help', ) ); &addCmdHook("main", 'karma', ('CODEREF' => 'karma', ) ); -&addCmdHook("main", 'i?spell', ('CODEREF' => 'ispell', +&addCmdHook("main", 'i?spell', ('CODEREF' => 'ispell', Help => 'spell', Identifier => 'spell', ) ); -&addCmdHook("main", 'd?nslookup', ('CODEREF' => 'DNS', +&addCmdHook("main", 'd?nslookup', ('CODEREF' => 'DNS', Help => 'nslookup', Identifier => 'allowDNS', Forker => "NULL", ) ); -&addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell', - Help => 'tell', Identifier => 'allowTelling', ) ); - +&addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell', + Help => 'tell', Identifier => 'allowTelling', + Cmdstats => 'Tell') ); +&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse', + Module => 'news', 'Cmdstats' => 'News' ) ); +&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats', +# Forker => "NULL", + ) ); &status("CMD: loaded ".scalar(keys %hooks_main)." MAIN command hooks."); @@ -52,18 +58,21 @@ sub chaninfo { ### line 1. foreach (sort keys %channels) { - if (/^\s*$/ or / /) { + if ( /^\s*$/ or / / ) { &status("chanstats: fe channels: chan == NULL."); &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) { - $tucount += scalar(keys %{$channels{$chan}{''}}); + $tucount += scalar(keys %{ $channels{$chan}{''} }); } ### unique user count. @@ -76,6 +85,10 @@ sub chaninfo { } } + if (scalar @nicks != $uucount) { + &DEBUG("nicks != uucount..."); + } + my $chans = scalar(keys %channels); &pSReply( "i've cached \002$tucount\002 ". &fixPlural("user",$tucount). @@ -96,7 +109,7 @@ sub chaninfo { # Step 1: my @array; - foreach (sort keys %{$chanstats{$chan}}) { + foreach (sort keys %{ $chanstats{$chan} }) { my $int = $chanstats{$chan}{$_}; next unless ($int); @@ -116,7 +129,7 @@ sub chaninfo { - $chanstats{$chan}{'Part'}; if ($delta_stats) { - my $total = scalar(keys %{$channels{$chan}{''}}); + my $total = scalar(keys %{ $channels{$chan}{''} }); &status("chaninfo: join ~= signoff + part (drift of $delta_stats < $total)."); if ($delta_stats > $total) { @@ -128,7 +141,7 @@ sub chaninfo { undef @array; my $type; foreach ("v","o","") { - my $int = scalar(keys %{$channels{$chan}{$_}}); + my $int = scalar(keys %{ $channels{$chan}{$_} }); next unless ($int); $type = "Voice" if ($_ eq "v"); @@ -140,11 +153,21 @@ sub chaninfo { $reply .= ". At the moment, ". &IJoin(@array); # Step 3: - ### TODO: what's wrong with the following? - my %new = map { $userstats{$_}{'Count'} => $_ } keys %userstats; - my($count) = (sort { $b <=> $a } keys %new)[0]; + my %new; + foreach (keys %userstats) { + next unless (exists $userstats{$_}{'Count'}); + if ($userstats{$_}{'Count'} =~ /^\D+$/) { + &WARN("userstats{$_}{Count} is non-digit."); + next; + } + + $new{$_} = $userstats{$_}{'Count'}; + } + + # todo: show top 3 with percentages? + my($count) = (sort { $new{$a} <=> $new{$b} } keys %new)[0]; if ($count) { - $reply .= ". \002$new{$count}\002 has said the most with a total of \002$count\002 messages"; + $reply .= ". \002$count\002 has said the most with a total of \002$new{$count}\002 messages"; } &pSReply("$reply."); } @@ -160,14 +183,14 @@ sub cmdstats { my %countstats; foreach (keys %cmdstats) { - $countstats{$cmdstats{$_}}{$_} = 1; + $countstats{ $cmdstats{$_} }{$_} = 1; } foreach (sort {$b <=> $a} keys %countstats) { my $int = $_; next unless ($int); - foreach (keys %{$countstats{$int}}) { + foreach (keys %{ $countstats{$int} }) { push(@array, "\002$int\002 of $_"); } } @@ -201,7 +224,8 @@ sub factstats { sub karma { my $target = lc( shift || $who ); - my $karma = &dbGet("karma", "nick",$target,"karma") || 0; + my $karma = &sqlSelect("stats", "counter", + { nick => $target, type => "karma" }) || 0; if ($karma != 0) { &pSReply("$target has karma of $karma"); @@ -213,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; } @@ -243,6 +267,9 @@ sub ispell { } elsif (/^\+/) { &DEBUG("spell: '+' found => '$_'."); last; + } elsif (/^# (.*?) 0$/) { + # none found. + last; } else { &DEBUG("spell: unknown: '$_'."); } @@ -269,7 +296,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; @@ -277,19 +304,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; } @@ -303,30 +330,29 @@ sub tell { $target = $talkchannel if ($target =~ /^us$/i); $target = $who if ($target =~ /^(me|myself)$/i); - &status("tell: target = $target, query = $query"); + &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; } - # ... + my $oldwho = $who; + my $oldmtype = $msgType; + $who = $target; my $result = &doQuestion($tell_obj); - # ^ returns '0' if nothing was found. + # ^ returns '0' if nothing was found. + $who = $oldwho; # no such factoid. - if ($result =~ /^0?$/) { - my $oldwho = $who; - my $oldmtype = $msgType; + if (!defined $result || $result =~ /^0?$/) { $who = $target; $msgType = "private"; @@ -338,7 +364,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; @@ -372,10 +398,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)); @@ -383,13 +416,15 @@ sub DNS { $result = $match." is ".$x unless ($x =~ /^\s*$/); } 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"; } @@ -398,6 +433,66 @@ sub DNS { &performReply($result); } +sub countryStats { + if (exists $cache{countryStats}) { + &msg($who,"countrystats is already running!"); + return; + } + + if ($chan eq "") { + $chan = $_[0]; + } + + if ($chan eq "") { + &help("countrystats"); + return; + } + + $conn->who($chan); + $cache{countryStats}{chan} = $chan; + $cache{countryStats}{mtype} = $msgType; + $cache{countryStats}{who} = $who; + $cache{on_who_Hack} = 1; +} + +sub do_countrystats { + $chan = $cache{countryStats}{chan}; + $msgType = $cache{countryStats}{mtype}; + $who = $cache{countryStats}{who}; + + my $total = 0; + my %cstats; + foreach (keys %{ $cache{nuhInfo} }) { + my $h = $cache{nuhInfo}{$_}{Host}; + + if ($h =~ /^.*\.(\D+)$/) { # host + $cstats{$1}++; + } else { # ip + $cstats{unresolve}++; + } + $total++; + } + my %count; + foreach (keys %cstats) { + $count{ $cstats{$_} }{$_} = 1; + } + + my @list; + foreach (sort {$b <=> $a} keys %count) { + my $str = join(", ", sort keys %{ $count{$_} }); +# push(@list, "$str ($_)"); + my $perc = sprintf("%.01f", 100 * $_ / $total); + $perc =~ s/\.0+$//; + push(@list, "$str ($_, $perc %)"); + } + + # todo: move this into a scheduler like nickometer + $msgType = "private"; + &pSReply( &formListReply(0, "Country Stats ", @list) ); + + delete $cache{countryStats}; + delete $cache{on_who_Hack}; +} ### ### amalgamated commands. @@ -406,26 +501,31 @@ sub DNS { sub userCommands { # conversion: ascii. if ($message =~ /^(asci*|chr) (\d+)$/) { - return '' unless (&IsParam("allowConv")); + &DEBUG("ascii/chr called ..."); + return unless (&hasParam("allowConv")); - $arg = $2; - if ($arg < 32) { - $arg += 64; - $result = "^".chr($arg); - } else { - $result = chr($2); - } - $result = "NULL" if ($arg == 0); + &DEBUG("ascii/chr called"); + + $arg = $2; + $result = chr($arg); + $result = "NULL" if ($arg == 0); &performReply( sprintf("ascii %s is '%s'", $arg, $result) ); + return; } # conversion: ord. - if ($message =~ /^ord (.)$/) { - return '' unless (&IsParam("allowConv")); + if ($message =~ /^ord(\s+(.*))$/) { + return unless (&hasParam("allowConv")); + + $arg = $2; + + if (!defined $arg or length $arg != 1) { + &help("ord"); + return; + } - $arg = $1; if (ord($arg) < 32) { $arg = chr(ord($arg) + 64); if ($arg eq chr(64)) { @@ -441,6 +541,7 @@ sub userCommands { # hex. if ($message =~ /^hex(\s+(.*))?$/i) { + return unless (&hasParam("allowConv")); my $arg = $2; if (!defined $arg) { @@ -464,13 +565,27 @@ sub userCommands { } # crypt. - if ($message =~ /^crypt\s+(\S+)\s*(?:,| )\s*(\S+)/) { - # word salt. - &pSReply(crypt($1, $2)); - return; - } + if ($message =~ /^crypt(\s+(.*))?$/i) { + my @args = split /\s+/, $2; + + if (!scalar @args or scalar @args > 2) { + &help("crypt"); + return; + } + + if (scalar @args == 2) { + if (length $args[0] != 2) { + &msg($who, "invalid format..."); + return; + } + &pSReply( crypt($args[1], $args[0]) ); + } else { + &pSReply( &mkcrypt($args[0]) ); + } + return; + } # cycle. if ($message =~ /^(cycle)(\s+(\S+))?$/i) { @@ -501,6 +616,17 @@ sub userCommands { return; } + # reload. + if ($message =~ /^reload$/i) { + return unless (&hasFlag("n")); + + &status("USER reload $who"); + &pSReply("reloading..."); + my $modules = &reloadAllModules(); + &pSReply("reloaded:$modules"); + return; + } + # redir. if ($message =~ /^redir(\s+(.*))?/i) { return unless (&hasFlag("o")); @@ -532,13 +658,19 @@ sub userCommands { my @redir; &status("Redirect '$factoid' (". ($#list) .")..."); for (@list) { + my $x = $_; next if (/^\Q$factoid\E$/i); &status(" Redirecting '$_'."); my $was = &getFactoid($_); + if ($was =~ / see/i) { + &status("warn: not redirecting a redirection."); + next; + } + &DEBUG(" was '$was'."); - push(@redir,$_); - &setFactInfo($_, "factoid_value", " see $factoid"); + push(@redir,$x); + &setFactInfo($x, "factoid_value", " see $factoid"); } &status("Done."); @@ -578,33 +710,63 @@ 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; } # ircstats. - if ($message =~ /^ircstats$/i) { + if ($message =~ /^ircstats?$/i) { + $ircstats{'TotalTime'} ||= 0; + $ircstats{'OffTime'} ||= 0; + my $count = $ircstats{'ConnectCount'}; my $format_time = &Time2String(time() - $ircstats{'ConnectTime'}); + my $total_time = time() - $ircstats{'ConnectTime'} + + $ircstats{'TotalTime'}; my $reply; - foreach (keys %ircstats) { - &DEBUG("ircstats: $_ => '$ircstats{$_}'."); + my $connectivity = 100 * ($total_time - $ircstats{'OffTime'}) / + $total_time; + my $p = sprintf("%.03f", $connectivity); + $p =~ s/(\.\d*)0+$/$1/; + if ($p =~ s/\.0$//) { + # this should not happen... but why... + } else { + $p =~ s/\.$// + } + + if ($total_time != (time() - $ircstats{'ConnectTime'}) ) { + my $tt_format = &Time2String($total_time); + &DEBUG("tt_format => $tt_format"); } ### RECONNECT COUNT. @@ -614,59 +776,112 @@ sub userCommands { } else { $reply = "Currently I'm hooked up to $ircstats{'Server'} but only". " for $format_time. ". - "I had to reconnect \002$count\002 times."; + "I had to reconnect \002$count\002 times.". + " Connectivity: $p %"; } ### REASON. my $reason = $ircstats{'DisconnectReason'}; if (defined $reason) { - $reply .= " I was last disconnected for '$reason'."; + $reply .= ". I was last disconnected for '$reason'."; } &pSReply($reply); - + return; } # 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"); + my $forks = 0; + foreach (keys %forked) { + $forks += scalar keys %{ $forked{$_} }; + } + $forks /= 2; + $count{'Commands'} = 0; + foreach (keys %cmdstats) { + $count{'Commands'} += $cmdstats{$_}; + } &pSReply( "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." + "kB of memory. With \002$forks\002 active ". + &fixPlural("fork",$forks). + "." ); 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} }) { + &DEBUG("cmdstats: $hash{$i}{$_} = $_"); + } + } + &DEBUG("end of cmdstats."); +} + + return; } # wantNick. xk++ - if ($message =~ /^wantNick$/i) { + if ($message =~ /^wantNick(\+)?$/i) { + my ($force) = ($1) ? 1 : 0; + $force = 0 unless (&IsFlag("n")); + + # 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 :) + # todo: use cache{nickserv} + if ($param{'nickServ_pass'}) { + return if ($param{'ircNick'} eq $ident or $force == 0); + + &status("someone is using our nick; GHOSTing"); + &msg($who, "using GHOST on $param{'ircNick'}."); + &msg("NickServ", "GHOST $param{'ircNick'} $param{'nickServ_pass'}"); + + $conn->schedule(5, sub { + &status("going to change nick after GHOST."); + &nick( $param{'ircNick'} ); + } ); + + return; } return;