[nexuiz-commits] r8527 - trunk/server/rcon2irc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2010-01-22 15:06:38 -0500 (Fri, 22 Jan 2010)
New Revision: 8527

Modified:
   trunk/server/rcon2irc/rcon2irc.pl
Log:
minor code cleanups in merlijn's patch

Modified: trunk/server/rcon2irc/rcon2irc.pl
===================================================================
--- trunk/server/rcon2irc/rcon2irc.pl	2010-01-22 20:06:20 UTC (rev 8526)
+++ trunk/server/rcon2irc/rcon2irc.pl	2010-01-22 20:06:38 UTC (rev 8527)
@@ -1126,7 +1126,7 @@
 
 	# IRC admin commands
 	[ irc => q{:(([^! ]*)![^ ]*) (?i:PRIVMSG) [^&#%]\S* :(.*)} => sub {
-		return 0 unless ($config{irc_admin_password} ne '' || $config{irc_quakenet_authusers});
+		return 0 unless ($config{irc_admin_password} ne '' || $store{irc_quakenet_users});
 
 		my ($hostmask, $nick, $command) = @_;
 		my $dpnick = color_dpfix $nick;
@@ -1312,7 +1312,7 @@
 	# Catch joins of people in a channel the bot is in and catch our own joins of a channel
 	[ irc => q{:(([^! ]*)![^ ]*) JOIN (#.+)} => sub {
 		my ($hostmask, $nick, $chan) = @_;
-		return 0 unless ($config{irc_quakenet_authusers});
+		return 0 unless ($store{irc_quakenet_users});
 		
 		if ($nick eq $config{irc_nick}) {
 			out irc => 0, "PRIVMSG Q :users $chan"; # get auths for all users
@@ -1327,7 +1327,7 @@
 	# Catch response of users request
 	[ irc => q{:Q!TheQBot at CServe.quakenet.org NOTICE [^:]+ :[@\+\s]?(\S+)\s+(\S+)\s*(\S*)\s*\((.*)\)} => sub {
 		my ($nick, $username, $flags, $host) = @_;
-		return 0 unless ($config{irc_quakenet_authusers});
+		return 0 unless ($store{irc_quakenet_users});
 		
 		$store{logins}{"$nick!$host"} = time() + 600 if ($store{quakenet_users}->{$username});
 		
@@ -1337,7 +1337,7 @@
 	# Catch response of whois request
 	[ irc => q{:Q!TheQBot at CServe.quakenet.org NOTICE [^:]+ :-Information for user (.*) \(using account (.*)\):} => sub {
 		my ($nick, $username) = @_;
-		return 0 unless ($config{irc_quakenet_authusers});
+		return 0 unless ($store{irc_quakenet_users});
 		
 		if ($store{quakenet_users}->{$username}) {
 			my $hostmask = $store{quakenet_hosts}->{$nick};
@@ -1690,7 +1690,7 @@
 
 # If users for quakenet are listed, parse them into a hash and schedule a sub to query information
 if ($config{irc_quakenet_authusers} ne '') {
-	$store{quakenet_users} = { map { $_ => 1 } split ' ', $config{irc_quakenet_authusers} };
+	$store{quakenet_users} = { map { $_ => 1 } split / /, $config{irc_quakenet_authusers} };
 	
 	schedule sub {
 		my ($timer) = @_;