X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=blootbot%2Fsrc%2FUserExtra.pl;h=97fffc4b29a6c17ba07ddb7c7c924c68015fb2e7;hb=f4df88a364184f78780f37970e46711e2d05239d;hp=d028ca5ab74b9fe65919971ee64268a5f3b91ff0;hpb=b48f37c033ab5d530b4f94ce24be4d511a06d365;p=infobot.git

diff --git a/blootbot/src/UserExtra.pl b/blootbot/src/UserExtra.pl
index d028ca5..97fffc4 100644
--- a/blootbot/src/UserExtra.pl
+++ b/blootbot/src/UserExtra.pl
@@ -17,6 +17,7 @@ use vars qw(%channels %chanstats %cmdstats %count %ircstats %param
 
 &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',
@@ -58,9 +59,9 @@ sub chaninfo {
 
 	### line 1.
 	foreach (sort keys %channels) {
-	    if (/^\s*$/ or / /) {
+	    if ( /^\s*$/ or / / ) {
 		&status("chanstats: fe channels: chan == NULL.");
-		&ircCheck();
+		#&ircCheck();
 		next;
 	    }
 	    next if (/^_default$/);
@@ -69,6 +70,7 @@ sub chaninfo {
 	    push(@array, $str);
 	}
 	&pSReply($reply.": ".join(', ', @array));
+	&ircCheck();
 
 	### total user count.
 	foreach $chan (keys %channels) {
@@ -164,8 +166,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";
     }
@@ -225,7 +227,7 @@ sub factstats {
 sub karma {
     my $target	= lc( shift || $who );
     my $karma	= &sqlSelect("stats", "counter",
-	{ nick => $target, type => "karma" }) || 0; 
+	{ nick => $target, type => "karma" }) || 0;
 
     if ($karma != 0) {
 	&pSReply("$target has karma of $karma");
@@ -236,8 +238,21 @@ sub karma {
 
 sub ispell {
     my $query = shift;
+    my $binary;
+    my @binaries = (
+	'/usr/bin/aspell',
+	'/usr/bin/ispell',
+	'/usr/bin/spell'
+    );
+
+    foreach (@binaries) {
+	if (-x $_) {
+	    $binary=$_;
+	    last;
+	}
+    }
 
-    if (! -x "/usr/bin/ispell") {
+    if (!$binary) {
 	&msg($who, "no binary found.");
 	return;
     }
@@ -249,7 +264,7 @@ sub ispell {
 
     my $reply = "I can't find alternate spellings for '$query'";
 
-    foreach (`/bin/echo '$query' | /usr/bin/ispell -a -S`) {
+    foreach (`/bin/echo '$query' | $binary -a -S`) {
 	chop;
 	last if !length;		# end of query.
 
@@ -330,7 +345,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)) {
@@ -416,7 +431,7 @@ sub DNS {
 	    $result = $match." is ".$x unless ($x =~ /^\s*$/);
 	} else {
 	    $result = "I can't seem to find that address in DNS";
-        }
+	}
 
     } else {
 
@@ -486,7 +501,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) );
 
@@ -535,7 +550,7 @@ sub userCommands {
 	    }
 	}
 
-	&performReply( sprintf("'%s' is ascii %s", $arg, ord $1) );
+	&performReply( sprintf("'%s' is ascii %s", $arg, ord $arg) );
 	return;
     }
 
@@ -622,8 +637,8 @@ sub userCommands {
 
 	&status("USER reload $who");
 	&pSReply("reloading...");
-	&reloadAllModules();
-	&pSReply("reloaded.");
+	my $modules = &reloadAllModules();
+	&pSReply("reloaded:$modules");
 	return;
     }
 
@@ -787,7 +802,7 @@ sub userCommands {
 	}
 
 	&pSReply($reply);
-		
+
 	return;
     }
 
@@ -795,8 +810,13 @@ sub userCommands {
     if ($message =~ /^statu?s$/i) {
 	my $startString	= scalar(gmtime $^T);
 	my $upString	= &Time2String(time() - $^T);
+	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{$_};
@@ -817,7 +837,9 @@ sub userCommands {
 	  ".  I have been awake for $upString this session, and ".
 	  "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"
 	);
 
 	return;
@@ -841,38 +863,36 @@ if (0) {
     }
 
     # 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;