#
# 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", '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.
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;
foreach (sort keys %channels) {
if ( /^\s*$/ or / / ) {
&status("chanstats: fe channels: chan == NULL.");
- &ircCheck();
+ #&ircCheck();
next;
}
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));
+ &performStrictReply($reply.": ".join(', ', @array));
### total user count.
foreach $chan (keys %channels) {
}
### 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;
}
$new{$_} = $userstats{$_}{'Count'};
}
- # todo: show top 3 with percentages?
- my($count) = (sort { $new{$a} <=> $new{$b} } keys %new)[0];
+ # TODO: show top 3 with percentages?
+ 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.
push(@array, "\002$int\002 of $_");
}
}
- &pSReply("command usage include ". &IJoin(@array).".");
+ &performStrictReply("command usage include ". &IJoin(@array).".");
}
# Factoid extension info. xk++
sub factstats {
my $type = shift(@_);
- &Forker("factoids", sub {
- &pSReply( &CmdFactStats($type) );
+ &Forker("Factoids", sub {
+ &performStrictReply( &CmdFactStats($type) );
} );
}
{ 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");
+ &performStrictReply("$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;
- }
-
- 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 {
my $args = shift;
my ($target, $tell_obj) = ('','');
# 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());
&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!");
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};
# conversion: ascii.
if ($message =~ /^(asci*|chr) (\d+)$/) {
&DEBUG("ascii/chr called ...");
- return unless (&hasParam("allowConv"));
+ return unless (&IsChanConfOrWarn("allowConv"));
&DEBUG("ascii/chr called");
# conversion: ord.
if ($message =~ /^ord(\s+(.*))$/) {
- return unless (&hasParam("allowConv"));
+ return unless (&IsChanConfOrWarn("allowConv"));
$arg = $2;
}
}
- &performReply( sprintf("'%s' is ascii %s", $arg, ord $1) );
+ &performReply( sprintf("'%s' is ascii %s", $arg, ord $arg) );
return;
}
# hex.
if ($message =~ /^hex(\s+(.*))?$/i) {
- return unless (&hasParam("allowConv"));
+ return unless (&IsChanConfOrWarn("allowConv"));
my $arg = $2;
if (!defined $arg) {
$retval .= sprintf(" %X", ord($_));
}
- &pSReply("$arg is$retval");
+ &performStrictReply("$arg is$retval");
return;
}
}
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;
return unless (&hasFlag("n"));
&status("USER reload $who");
- &pSReply("reloading...");
+ &performStrictReply("reloading...");
my $modules = &reloadAllModules();
- &pSReply("reloaded:$modules");
+ &performStrictReply("reloaded:$modules");
return;
}
}
# 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;
}
}
$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 %)"
);
$reply .= ". I was last disconnected for '$reason'.";
}
- &pSReply($reply);
+ &performStrictReply($reply);
return;
}
if ($message =~ /^statu?s$/i) {
my $startString = scalar(gmtime $^T);
my $upString = &Time2String(time() - $^T);
- my ($auser,$asystem,$cuser,$csystem) = times;
+ my ($puser,$psystem,$cuser,$csystem) = times;
my $factoids = &countKeys("factoids");
my $forks = 0;
foreach (keys %forked) {
$count{'Commands'} += $cmdstats{$_};
}
- &pSReply(
+ &performStrictReply(
"Since $startString, there have been".
" \002$count{'Update'}\002 ".
&fixPlural("modification", $count{'Update'}).
"I'm using about \002$memusage\002 ".
"kB of memory. With \002$forks\002 active ".
&fixPlural("fork",$forks).
- ". uptimes $auser,$asystem,$cuser,$csystem"
+ ". Process time user/system $puser/$psystem child $cuser/$csystem"
);
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) {
- my ($force) = ($1) ? 1 : 0;
- $force = 0 unless (&IsFlag("n"));
+ # FIXME does not try to get nick "back", just switches nicks
+ if ($message =~ /^wantNick\s(.*)?$/i) {
+ return unless (&hasFlag("o"));
+ my $wantnick = lc $1;
+ my $mynick = $conn->nick();
- # 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 ($mynick eq $wantnick) {
+ &msg($who, "I hope you're right. I'll try anyway (mynick=$mynick, wantnick=$wantnick).");
}
# fallback check, I guess. needed?
- if (! &IsNickInAnyChan( $param{'ircNick'} ) ) {
- my $str = "attempting to change nick to $param{'ircNick'}";
+ if (! &IsNickInAnyChan( $wantnick ) ) {
+ my $str = "attempting to change nick from $mynick to $wantnick";
&status($str);
&msg($who, $str);
- &nick($param{ 'ircNick' });
+ &nick($wantnick);
return;
}
# idea from dondelecarlo :)
- # todo: use cache{nickserv}
+ # 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'}");
+ my $str = "someone is using nick $wantnick; GHOSTing";
+ &status($str);
+ &msg($who, $str);
+ &msg("NickServ", "GHOST $wantnick $param{'nickServ_pass'}");
$conn->schedule(5, sub {
- &status("going to change nick after GHOST.");
- &nick( $param{'ircNick'} );
+ &status("going to change nick from $mynick to $wantnick after GHOST.");
+ &nick($wantnick);
} );
return;