From 072942842fc723ede15dcf88efe19b0497e9cc27 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Mon, 28 May 2007 11:02:03 +0000
Subject: [PATCH] some refactoring

---
 Access.pm | 10 +++++++---
 Misc.pm   | 10 +++++-----
 PA.pm     | 34 +++++++++++++++++++++++++++-------
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/Access.pm b/Access.pm
index 77f88cb..03851bb 100644
--- a/Access.pm
+++ b/Access.pm
@@ -23,8 +23,11 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/officer dc bc hc scanner intel masterop masterinvite/;
+our @EXPORT = qw/member officer dc bc hc scanner intel masterop masterinvite/;
 
+sub member {
+	return groupmember("HM");
+};
 sub officer {
 	return groupmember("HO");
 };
@@ -54,9 +57,10 @@ sub masterinvite {
 sub groupmember {
 	my ($groups) = @_;
 	$groups = join ",", map {"'$_'"} split //, $groups;
-	my $f = $ND::DBH->prepare("SELECT uid,username FROM users NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag IN ('T',$groups) AND lower(hostmask) = ?");
+	my $f = $ND::DBH->prepare("SELECT uid,username FROM users NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag IN ('T',$groups) AND lower(hostmask) = ?") or print $ND::DBH->errstr;
 	$f->execute(lc($ND::address));
-	return $f->fetchrow_hashref;
+	my $user = $f->fetchrow_hashref;
+	return $user;
 };
 
 1;
diff --git a/Misc.pm b/Misc.pm
index 2b479dd..c6e8db9 100644
--- a/Misc.pm
+++ b/Misc.pm
@@ -37,12 +37,12 @@ $ND::xanchan = "#ViolatorS";
 
 sub valuecolor {
 	my $s = $_;
-	$s = $_[1] if defined $_[1];
+	$s = $_[1] if $#_ >= 1;
 	$s = "" unless defined $s;
-	return chr(3)."5$s".chr(3) if $s eq 'Hostile';
-	return chr(3)."3$s".chr(3) if $s eq 'Friendly';
-	return chr(3)."3$s".chr(3) if $s eq 'Nap' or $s eq 'NAP';
-	return chr(2)."$s".chr(2) if $_[0];
+	return chr(3)."5$s".chr(15) if $s eq 'Hostile';
+	return chr(3)."3$s".chr(15) if $s eq 'Friendly';
+	return chr(3)."3$s".chr(15) if $s eq 'Nap' or $s eq 'NAP';
+	return chr(2)."$s".chr(15) if $_[0];
 	return $s;
 }
 
diff --git a/PA.pm b/PA.pm
index e5f20bf..5781ee7 100644
--- a/PA.pm
+++ b/PA.pm
@@ -31,15 +31,35 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/checkPlanet checkGal shipEff shipStop parseValue prettyValue calcXp/;
 
 sub checkPlanet {
-	my ($x,$y,$z,$intel) = @_;
+	my ($msg) = @_;
+
+	my ($x,$y,$z,$nick);
+	if ($msg =~ /(\d+)\D+(\d+)\D+(\d+)/){
+		$x = $1;
+		$y = $2;
+		$z = $3;
+	}elsif (officer()){
+		$nick = $msg;
+	}else{
+		$ND::server->command("notice $ND::target usage .p X:Y:Z".(officer() ? ' or .p nick' : ''));
+	}
 	DB();
-	my $f = $ND::DBH->prepare("SELECT ruler,planet,race,score,size,value,scorerank,sizerank,valuerank, xp, xprank, alliance FROM current_planet_stats WHERE x = ? AND y = ? and z = ?");
-	$f->execute($x,$y,$z);
-	while (my @row = $f->fetchrow()){
-		@row = map (valuecolor(1),@row);
+	my $f = $ND::DBH->prepare(q{SELECT coords(x,y,z),ruler,planet,race,score,size,value,scorerank,sizerank,
+		valuerank, xp, xprank, alliance, relationship, nick, planet_status, hit_us, channel
+		FROM current_planet_stats WHERE (x = $1 AND y = $2 and z = $3) OR nick ILIKE $4 LIMIT 1
+	});
+	$f->execute($x,$y,$z,$nick);
+	if (my $planet = $f->fetchrow_hashref()){
+		for (keys %{$planet}){
+			$planet->{$_} = valuecolor(1,$planet->{$_});
+		}
 		my $ally = "";
-		$ally = " Alliance=$row[11]," if $intel;
-		$ND::server->command("notice $ND::target $x:$y:$z $row[0] OF $row[1],$ally Race=$row[2], Score=$row[3] ($row[6]), Size=$row[4] ($row[7]), Value=$row[5] ($row[8]), XP=$row[9] ($row[10])");
+		if (officer() || dc()){
+			$ally = "Alliance=$planet->{alliance} ($planet->{relationship}), Nick=$planet->{nick} ($planet->{planet_status}), Channel: $planet->{channel}, Hostile Count: $planet->{hit_us},";
+		}
+		$ND::server->command("notice $ND::target $planet->{coords} $planet->{ruler} OF $planet->{planet},$ally Race=$planet->{race}, Score=$planet->{score} ($planet->{scorerank}), Size=$planet->{size} ($planet->{sizerank}), Value=$planet->{value} ($planet->{valuerank}), XP=$planet->{xp} ($planet->{xprank})");
+	}else{
+		$ND::server->command("notice $ND::target Couldn't find planet: $msg");
 	}
 }
 sub checkGal {
-- 
2.39.2