X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FUserExtra.pl;h=9d27eb9d5e52280399af1d0cbef20b0f99d8c4e5;hb=8df0fa618dc55e5c565d45b3b76aa8858a845097;hp=62fbebfcfe96c0d68c16eb53c8e11ce45219b97e;hpb=f150d0863df566618041556e6587a4fd6e0a7db3;p=infobot.git diff --git a/src/UserExtra.pl b/src/UserExtra.pl index 62fbebf..9d27eb9 100644 --- a/src/UserExtra.pl +++ b/src/UserExtra.pl @@ -5,9 +5,11 @@ # Created: 20000107 # -#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. @@ -15,25 +17,21 @@ 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', - 'Cmdstats' => 'Factoid Info', Module => 'factoids', ) ); -&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', - 'Cmdstats' => 'Factoid Statistics', Help => "factstats", - Forker => 1, 'Identifier' => 'factoids', ) ); -&addCmdHook("main", 'help', ('CODEREF' => 'help', +&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', +&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', +&addCmdHook("main", 'News', ('CODEREF' => 'News::Parse', + Module => 'News', 'Cmdstats' => 'News' ) ); +&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats', # Forker => "NULL", ) ); @@ -56,14 +54,18 @@ sub chaninfo { ### line 1. foreach (sort keys %channels) { - if (/^\s*$/ or / /) { + if ( /^\s*$/ or / / ) { &status("chanstats: fe channels: chan == NULL."); - &ircCheck(); + #&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)); + &ircCheck(); ### total user count. foreach $chan (keys %channels) { @@ -79,7 +81,7 @@ sub chaninfo { push(@nicks, $_); } } - &DEBUG("nicks => '".scalar(@nicks)."'..."); + if (scalar @nicks != $uucount) { &DEBUG("nicks != uucount..."); } @@ -159,8 +161,8 @@ sub chaninfo { $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"; } @@ -219,8 +221,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"); @@ -229,56 +231,6 @@ sub 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) = ('',''); @@ -325,7 +277,7 @@ 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)) { @@ -347,7 +299,7 @@ sub tell { $who = $oldwho; # no such factoid. - if ($result =~ /^0?$/) { + if (!defined $result || $result =~ /^0?$/) { $who = $target; $msgType = "private"; @@ -389,45 +341,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!"); @@ -443,7 +356,7 @@ sub countryStats { return; } - &rawout("WHO $chan"); + $conn->who($chan); $cache{countryStats}{chan} = $chan; $cache{countryStats}{mtype} = $msgType; $cache{countryStats}{who} = $who; @@ -481,7 +394,7 @@ sub do_countrystats { push(@list, "$str ($_, $perc %)"); } - # todo: move this into a scheduler like nickometer + # TODO: move this into a scheduler like nickometer $msgType = "private"; &pSReply( &formListReply(0, "Country Stats ", @list) ); @@ -530,7 +443,7 @@ sub userCommands { } } - &performReply( sprintf("'%s' is ascii %s", $arg, ord $1) ); + &performReply( sprintf("'%s' is ascii %s", $arg, ord $arg) ); return; } @@ -569,10 +482,11 @@ 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]) ); } else { @@ -617,9 +531,8 @@ sub userCommands { &status("USER reload $who"); &pSReply("reloading..."); - &reloadAllModules(); - &pSReply("reloaded."); - + my $modules = &reloadAllModules(); + &pSReply("reloaded:$modules"); return; } @@ -783,16 +696,21 @@ sub userCommands { } &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 ($puser,$psystem,$cuser,$csystem) = times; + 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{$_}; @@ -802,25 +720,30 @@ 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." + "kB of memory. With \002$forks\002 active ". + &fixPlural("fork",$forks). + ". Process time user/system $puser/$psystem child $cuser/$csystem" ); - # 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} }) { @@ -828,27 +751,45 @@ sub userCommands { } } &DEBUG("end of cmdstats."); +} return; } # wantNick. xk++ - if ($message =~ /^wantNick$/i) { - if ($param{'ircNick'} eq $ident) { - &msg($who, "I hope you're right. I'll try anyway."); + # 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(); + + if ($mynick eq $wantnick) { + &msg($who, "I hope you're right. I'll try anyway (mynick=$mynick, wantnick=$wantnick)."); } - &DEBUG("ircNick => $param{'ircNick'}"); - &DEBUG("ident => $ident"); - if (! &IsNickInAnyChan( $param{ircNick} ) ) { - my $str = "attempting to change nick to $param{'ircNick'}"; + # fallback check, I guess. needed? + if (! &IsNickInAnyChan( $wantnick ) ) { + my $str = "attempting to change nick from $mynick to $wantnick"; &status($str); &msg($who, $str); - &nick($param{'ircNick'}); - } else { - &msg($who, "hrm.. I shouldn't do it (BUG?) but doing it anyway!"); - &DEBUG("wN: nick is somewhere... should try later."); - &nick($param{'ircNick'}); + &nick($wantnick); + return; + } + + # idea from dondelecarlo :) + # TODO: use cache{nickserv} + if ($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 from $mynick to $wantnick after GHOST."); + &nick($wantnick); + } ); + + return; } return;