X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FUserExtra.pl;h=12ec9c324a2f6729c5381cf2341b602f9da802c5;hb=f3618054e8879cfcc83a1e0c1d3aceb83a092ed7;hp=ba80639d74a073b95a42a8e516f93814db764447;hpb=f4387a2d0258bc7acc78ab083e942720d6a5d13e;p=infobot.git diff --git a/src/UserExtra.pl b/src/UserExtra.pl index ba80639..12ec9c3 100644 --- a/src/UserExtra.pl +++ b/src/UserExtra.pl @@ -1,46 +1,15 @@ # # UserExtra.pl: User Commands, Public. # Author: dms -# Version: v0.2b (20000707) -# Created: 20000107 # 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); + %cache %mask %userstats); -### -### Start of command hooks for UserExtra. -### - -&addCmdHook("main", 'chan(stats|info)', ('CODEREF' => 'chaninfo', ) ); -&addCmdHook("main", 'cmd(stats|info)', ('CODEREF' => 'cmdstats', ) ); -&addCmdHook("main", 'sched(stats|info)', ('CODEREF' => 'scheduleList', ) ); -&addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo', - 'Cmdstats' => 'Factoid Info', Module => 'factoids', ) ); -&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', - 'Cmdstats' => 'Factoid Stats', Help => "factstats", - Forker => 1, 'Identifier' => 'factoids', ) ); -&addCmdHook("main", 'help', ('CODEREF' => 'help', - 'Cmdstats' => 'Help', ) ); -&addCmdHook("main", 'karma', ('CODEREF' => 'karma', ) ); -&addCmdHook("main", 'i?spell', ('CODEREF' => 'ispell', - Help => 'spell', Identifier => 'spell', ) ); -&addCmdHook("main", 'd?nslookup', ('CODEREF' => 'DNS', - Help => 'nslookup', Identifier => 'allowDNS', - Forker => "NULL", ) ); -&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."); +### hooks get added in CommandHooks.pl. ### ### Start of commands for hooks. @@ -52,7 +21,7 @@ sub chaninfo { if ($chan eq "") { # all channels. my $i = keys %channels; - my $reply = "i am on \002$i\002 ".&fixPlural("channel",$i); + my $reply = "I'm on \002$i\002 ".&fixPlural("channel",$i); my $tucount = 0; # total user count. my $uucount = 0; # unique user count. my @array; @@ -66,11 +35,10 @@ sub chaninfo { } next if (/^_default$/); - my $str = sprintf("%s (%d)", $_, scalar(keys %{ $channels{$_}{''} })); + my $str = sprintf("%s/%d", $_, scalar(keys %{ $channels{$_}{''} })); push(@array, $str); } - &pSReply($reply.": ".join(', ', @array)); - &ircCheck(); + &performStrictReply($reply.": ".join(', ', @array)); ### total user count. foreach $chan (keys %channels) { @@ -78,26 +46,23 @@ sub chaninfo { } ### unique user count. - my @nicks; + my %nicks = (); foreach $chan (keys %channels) { - foreach (keys %{ $channels{$chan}{''} }) { - next if (grep /^\Q$_\E$/, @nicks); - $uucount++; - push(@nicks, $_); + my $nick; + foreach $nick (keys %{ $channels{$chan}{''} }) { + $nicks{$nick}++; } } - - if (scalar @nicks != $uucount) { - &DEBUG("nicks != uucount..."); - } + $uucount = scalar(keys %nicks); my $chans = scalar(keys %channels); - &pSReply( + &performStrictReply( "i've cached \002$tucount\002 ". &fixPlural("user",$tucount). ", \002$uucount\002 unique ". &fixPlural("user",$uucount). ", distributed over \002$chans\002 ". &fixPlural("channel", $chans)."." ); + &ircCheck(); return; } @@ -167,11 +132,11 @@ sub chaninfo { } # TODO: show top 3 with percentages? - my($count) = (sort { $new{$a} <=> $new{$b} } keys %new)[0]; + my($count) = (sort { $new{$b} <=> $new{$a} } keys %new)[0]; if ($count) { $reply .= ". \002$count\002 has said the most with a total of \002$new{$count}\002 messages"; } - &pSReply("$reply."); + &performStrictReply("$reply."); } # Command statistics. @@ -196,7 +161,7 @@ sub cmdstats { push(@array, "\002$int\002 of $_"); } } - &pSReply("command usage include ". &IJoin(@array)."."); + &performStrictReply("command usage include ". &IJoin(@array)."."); } # Factoid extension info. xk++ @@ -219,8 +184,8 @@ sub factinfo { sub factstats { my $type = shift(@_); - &Forker("factoids", sub { - &pSReply( &CmdFactStats($type) ); + &Forker("Factoids", sub { + &performStrictReply( &CmdFactStats($type) ); } ); } @@ -230,60 +195,10 @@ sub karma { { nick => $target, type => "karma" }) || 0; if ($karma != 0) { - &pSReply("$target has karma of $karma"); + &performStrictReply("$target has karma of $karma"); } else { - &pSReply("$target has neutral karma"); - } -} - -sub ispell { - my $query = shift; - - if (! -x "/usr/bin/ispell") { - &msg($who, "no binary found."); - return; - } - - if (!&validExec($query)) { - &msg($who,"argument appears to be fuzzy."); - return; + &performStrictReply("$target has neutral karma"); } - - my $reply = "I can't find alternate spellings for '$query'"; - - foreach (`/bin/echo '$query' | /usr/bin/ispell -a -S`) { - chop; - last if !length; # end of query. - - if (/^\@/) { # intro line. - next; - } elsif (/^\*/) { # possibly correct. - $reply = "'$query' may be spelled correctly"; - last; - } elsif (/^\&/) { # possible correction(s). - s/^\& (\S+) \d+ \d+: //; - my @array = split(/,? /); - - $reply = "possible spellings for $query: @array"; - last; - } elsif (/^\+/) { - &DEBUG("spell: '+' found => '$_'."); - last; - } elsif (/^# (.*?) 0$/) { - # none found. - last; - } else { - &DEBUG("spell: unknown: '$_'."); - } - } - - &pSReply($reply); -} - -sub nslookup { - my $query = shift; - &status("DNS Lookup: $query"); - &DNS($query); } sub tell { @@ -361,8 +276,7 @@ sub tell { # support command redirection. # recursive cmdHooks aswell :) my $done = 0; - $done++ if &parseCmdHook("main", $tell_obj); - $done++ if &parseCmdHook("extra", $tell_obj); + $done++ if &parseCmdHook($tell_obj); $message = $tell_obj; $done++ unless (&Modules()); @@ -396,45 +310,6 @@ sub tell { &msg($target, $reply); } -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+)/) { - $match = $1; - &status("DNS query by IP address: $match"); - - $y = pack('C4', split(/\./, $match)); - $x = (gethostbyaddr($y, &AF_INET)); - - if ($x !~ /^\s*$/) { - $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: $dns"); - $x = join('.',unpack('C4',(gethostbyname($dns))[4])); - - if ($x !~ /^\s*$/) { - $result = $dns." is ".$x; - } else { - $result = "I can\'t find that machine name"; - } - } - - &performReply($result); -} - sub countryStats { if (exists $cache{countryStats}) { &msg($who,"countrystats is already running!"); @@ -488,9 +363,9 @@ sub do_countrystats { push(@list, "$str ($_, $perc %)"); } - # TODO: move this into a scheduler like nickometer + # TODO: move this into a scheduler $msgType = "private"; - &pSReply( &formListReply(0, "Country Stats ", @list) ); + &performStrictReply( &formListReply(0, "Country Stats ", @list) ); delete $cache{countryStats}; delete $cache{on_who_Hack}; @@ -504,7 +379,7 @@ sub userCommands { # conversion: ascii. if ($message =~ /^(asci*|chr) (\d+)$/) { &DEBUG("ascii/chr called ..."); - return unless (&hasParam("allowConv")); + return unless (&IsChanConfOrWarn("allowConv")); &DEBUG("ascii/chr called"); @@ -519,7 +394,7 @@ sub userCommands { # conversion: ord. if ($message =~ /^ord(\s+(.*))$/) { - return unless (&hasParam("allowConv")); + return unless (&IsChanConfOrWarn("allowConv")); $arg = $2; @@ -543,7 +418,7 @@ sub userCommands { # hex. if ($message =~ /^hex(\s+(.*))?$/i) { - return unless (&hasParam("allowConv")); + return unless (&IsChanConfOrWarn("allowConv")); my $arg = $2; if (!defined $arg) { @@ -561,7 +436,7 @@ sub userCommands { $retval .= sprintf(" %X", ord($_)); } - &pSReply("$arg is$retval"); + &performStrictReply("$arg is$retval"); return; } @@ -576,14 +451,15 @@ sub userCommands { } if (scalar @args == 2) { - if (length $args[0] != 2) { - &msg($who, "invalid format..."); - return; - } +# disable cause $1$ will use md5 +# if (length $args[0] != 2) { +# &msg($who, "invalid format..."); +# return; +# } - &pSReply( crypt($args[1], $args[0]) ); + &performStrictReply( crypt($args[1], $args[0]) ); } else { - &pSReply( &mkcrypt($args[0]) ); + &performStrictReply( &mkcrypt($args[0]) ); } return; @@ -623,9 +499,9 @@ sub userCommands { return unless (&hasFlag("n")); &status("USER reload $who"); - &pSReply("reloading..."); + &performStrictReply("reloading..."); my $modules = &reloadAllModules(); - &pSReply("reloaded:$modules"); + &performStrictReply("reloaded:$modules"); return; } @@ -682,16 +558,21 @@ sub userCommands { } # rot13 it. - if ($message =~ /^rot13(\s+(.*))?/i) { - my $reply = $2; + if ($message =~ /^rot([0-9]*)(\s+(.*))?/i) { + my $reply = $3; if (!defined $reply) { &help("rot13"); return; } + my $num = $1 % 26; + my $upper="ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + my $lower="abcdefghijklmnopqrstuvwxyz"; + my $to=substr($upper,$num).substr($upper,0,$num).substr($lower,$num).substr($lower,0,$num); + eval "\$reply =~ tr/$upper$lower/$to/;"; - $reply =~ y/A-Za-z/N-ZA-Mn-za-m/; - &pSReply($reply); + #$reply =~ y/A-Za-z/N-ZA-Mn-za-m/; + &performStrictReply($reply); return; } @@ -737,7 +618,7 @@ sub userCommands { } $ratio = sprintf("%.01f", 100*$perc/($perc+$perc2) ); - &pSReply("Total CPU usage: \002$cpu_usage\002 s ... ". + &performStrictReply("Total CPU usage: \002$cpu_usage\002 s ... ". "Total used: \002$total\002 % ". "(parent/child ratio: $ratio %)" ); @@ -788,7 +669,7 @@ sub userCommands { $reply .= ". I was last disconnected for '$reason'."; } - &pSReply($reply); + &performStrictReply($reply); return; } @@ -809,7 +690,7 @@ sub userCommands { $count{'Commands'} += $cmdstats{$_}; } - &pSReply( + &performStrictReply( "Since $startString, there have been". " \002$count{'Update'}\002 ". &fixPlural("modification", $count{'Update'}). @@ -830,23 +711,6 @@ sub userCommands { ); 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++