X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FUserExtra.pl;h=ada60ce8113155e9c07a0e378c67793df0f403a1;hb=f7cae48a17d6decd0a9bd997188271daa0a885b1;hp=895d8cb22616eec2c3fe5ce7ded3bffe535dabb7;hpb=22a73ba6205f6120785f2e6a17921a76774ec3f7;p=infobot.git

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 895d8cb..ada60ce 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,25 @@ 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', 
+&addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell',
 	Help => 'tell', Identifier => 'allowTelling',
 	Cmdstats => 'Tell') );
-&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse', 
+&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse',
 	Module => 'news', 'Cmdstats' => 'News' ) );
-&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats', 
+&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats',
 #	Forker => "NULL",
  ) );
 
@@ -56,14 +58,17 @@ 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) {
@@ -79,7 +84,7 @@ sub chaninfo {
 		push(@nicks, $_);
 	    }
 	}
-	&DEBUG("nicks => '".scalar(@nicks)."'...");
+
 	if (scalar @nicks != $uucount) {
 	    &DEBUG("nicks != uucount...");
 	}
@@ -219,8 +224,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");
@@ -325,7 +330,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)) {
@@ -411,7 +416,7 @@ sub DNS {
 	    $result = $match." is ".$x unless ($x =~ /^\s*$/);
 	} else {
 	    $result = "I can't seem to find that address in DNS";
-        }
+	}
 
     } else {
 
@@ -617,8 +622,8 @@ sub userCommands {
 
 	&status("USER reload $who");
 	&pSReply("reloading...");
-	&reloadAllModules();
-	&pSReply("reloaded.");
+	my $modules = &reloadAllModules();
+	&pSReply("reloaded:$modules");
 	return;
     }
 
@@ -782,16 +787,20 @@ 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 $factoids	= &countKeys("factoids");
+	my $forks = 0;
+	foreach (keys %forked) {
+	    $forks += scalar keys %{ $forked{$_} };
+	}
+	$forks /= 2;
 	$count{'Commands'}	= 0;
 	foreach (keys %cmdstats) {
 	    $count{'Commands'} += $cmdstats{$_};
@@ -801,24 +810,28 @@ 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).
+	  "."
 	);
 
-	# todo: use 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) {
@@ -834,22 +847,41 @@ if (0) {
     }
 
     # 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");
 	}
-	&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.. I shouldn't do it (BUG?) but doing it anyway!");
-	    &DEBUG("wN: nick is somewhere... should try later.");
-	    &nick($param{'ircNick'});
+	    &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;