X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Members.pm;h=027ac7c0c611bbd04a86f438cc03974875e26475;hb=fb91afb326b44a3e46fb92b060696aabc343e1cc;hp=e60ecde6820886bfa35f0dc04f8d98ad75dd42c2;hpb=9b9f9324f849f89d812a73e6f7fdc36205b24e92;p=NDIRC.git

diff --git a/Members.pm b/Members.pm
index e60ecde..027ac7c 100644
--- a/Members.pm
+++ b/Members.pm
@@ -28,18 +28,16 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/currentCalls showraids checkPoints findSMS/;
 
 sub currentCalls {
-	my ($verbose) = @_;
-	DB();
+	my ($msg, $command) = @_;
 	if (1){ #TODO: add check for member
 		my $f = $ND::DBH->prepare(<<SQL
-	SELECT (c.landing_tick - tick()) AS eta, concat(i.shiptype||'/') AS shiptype, dc.username,p.x
+	SELECT (c.landing_tick - tick()) AS eta, concat(i.shiptype||'/') AS shiptype, dc.username
 	FROM calls c 
 		JOIN incomings i ON i.call = c.id
 		LEFT OUTER JOIN users dc ON dc.uid = c.dc
 		JOIN users u ON u.uid = c.member
-		JOIN current_planet_stats p ON u.planet = p.id
 	WHERE open AND (c.landing_tick - tick()) >= 7
-	GROUP BY c.id,c.landing_tick,dc.username,p.x
+	GROUP BY c.id,c.landing_tick,dc.username
 	ORDER BY c.landing_tick;
 SQL
 );
@@ -48,17 +46,16 @@ SQL
 		while (my @row = $f->fetchrow()){
 			chop($row[1]);
 			my $dc = defined $row[2] ? $row[2] : '';
-			$calls .= " (Anti $row[1] ETA: $row[0] Cluster: $row[3] DC: $dc) |"
+			$calls .= " (Anti $row[1] ETA: $row[0] DC: $dc) |"
 		}
 		chop($calls);
-		if (defined $verbose || length $calls > 0){
+		if (defined $command || length $calls > 0){
 			$ND::server->command("msg $ND::target Current calls: $calls");
 		}
 	}
 }
 
 sub showraids {
-	DB();
 	if (1){ #TODO: add check for member
 		my $f = $ND::DBH->prepare(<<SQL
 	SELECT id FROM raids 
@@ -69,7 +66,7 @@ SQL
 		$f->execute();
 		my $calls = "";
 		while (my ($raid) = $f->fetchrow()){
-			$calls .= " https://nd.ruin.nu/raids?raid=$raid |"
+			$calls .= " https://nd.ruin.nu/raids/view/$raid |"
 		}
 		$calls = "No open future raids" if ($f->rows == 0);
 		chop($calls);
@@ -78,11 +75,10 @@ SQL
 }
 
 sub checkPoints {
-	my ($nick) = @_;
-	DB();
+	my ($nick,$command) = @_;
 	my $f;
 	if ($nick){
-		if (officer() || dc() || bc()){
+		if (officer() || dc() || bc() || ia()){
 			$f = $ND::DBH->prepare("SELECT username, attack_points, defense_points, scan_points, humor_points FROM users WHERE username ILIKE ?");
 		}else{
 			$ND::server->command("msg $ND::target Only officers are allowed to check for others");