X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Scans.pm;h=9349838f6e7195533ac63784993e17ffe50bbe26;hb=02cffbdd44754378b27e1b87a1998368c1098973;hp=17007c384bae420f5b3f62a2d15d8f93496e7f46;hpb=3dd3a1090337ad0631ff547659cedf240736c788;p=NDIRC.git

diff --git a/Scans.pm b/Scans.pm
index 17007c3..9349838 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -25,25 +25,20 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addScan addScanGroup sendScan reqScan scanReqs/;
+our @EXPORT = qw/addScan addScanGroup sendScan reqScan scanReqs getScan/;
 
 sub addScan {
-	my ($id,$verbose, $quiet) = @_;
+	my ($id,$verbose) = @_;
 	if (1){
-		unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE NOT groupscan AND scan_id = ? AND tick >= tick() - 168},undef,$id)){
+		unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE NOT groupscan AND scan_id = LOWER(?) AND tick >= tick() - 168},undef,$id)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
 				FROM users WHERE hostmask ILIKE ? },undef,$ND::address);
-			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,uid) VALUES (?,tick(),COALESCE(?,-1))},
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,uid) VALUES (LOWER(?),tick(),COALESCE(?,-1))},
 					undef,$id,$user[0]) == 1){
 				if (@user){
 					$ND::DBH->do('UPDATE users SET scan_points = scan_points + 1 WHERE uid = ? ',undef,$user[0]);
 					$user[2] += 1;
-					if ($quiet){
-						$ND::server->command("msg $ND::target Added scan, points now $user[2]");
-					}
-					else{
-						$ND::server->command("msg $ND::target Added scan, at tick $user[3]. $user[1] points now $user[2]");
-					}
+					$ND::server->command("notice $ND::nick Added scan, points now $user[2]");
 				}elsif ($verbose){
 					$ND::server->command("msg $ND::target Added scan, but unknown user, no points");
 				}
@@ -56,13 +51,13 @@ sub addScan {
 sub addScanGroup {
 	my ($id,$verbose) = @_;
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE groupscan AND  scan_id = ? AND tick >= tick() - 168",undef,$id)){
+		unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE groupscan AND  scan_id = LOWER(?) AND tick >= tick() - 168},undef,$id)){
 			my @user = $ND::DBH->selectrow_array(q{SELECT uid,username, scan_points, tick() 
 				FROM users WHERE hostmask ILIKE ? },undef,$ND::address);
-			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,groupscan,uid) VALUES (?,tick(),true,COALESCE(?,-1))},
+			if ($ND::DBH->do(q{INSERT INTO scans (scan_id,tick,groupscan,uid) VALUES (LOWER(?),tick(),true,COALESCE(?,-1))},
 					undef,$id,$user[0]) == 1){
 				if (@user){
-					$ND::server->command("msg $ND::target Added scan group, at tick $user[3]. Points will be added after parsing");
+					$ND::server->command("notice $ND::nick Added scan group. Points will be added after parsing.");
 				}elsif ($verbose){
 					$ND::server->command("msg $ND::target Added scan, but unknown user, no points");
 				}
@@ -169,6 +164,13 @@ sub scanReqs {
 
 	if (scanner()){
 
+		my @notype;
+		if ($msg && $msg =~ /-([pdunja]+)/){
+			for (split //, $1){
+				push @notype, $scantypes[$scanid{$_}-1];
+			}
+		}
+
 		my $reqs = $ND::DBH->prepare(q{SELECT min(sr.id) AS id, x,y,z,type
 			FROM scan_requests sr
 				JOIN current_planet_stats p ON p.id = sr.planet
@@ -178,18 +180,66 @@ sub scanReqs {
 						AND type = sr.type
 						AND tick >= sr.tick
 				)
+				AND type <> ALL($1)
 			GROUP BY x,y,z,type
 			ORDER BY id
 			});
-		$reqs->execute;
+		$reqs->execute(\@notype);
 		my $text = '';
 		while (my $req = $reqs->fetchrow_hashref){
 			$text .= "$ND::B$req->{id}$ND::O http://game.planetarion.com/waves.pl?id=$scantypes{$req->{type}}&x=$req->{x}&y=$req->{y}&z=$req->{z} "
 		}
 
-		$text = 'No unhandled reqests.' unless $text;
+		$text = 'No unhandled requests.' unless $text;
 		$ND::server->command("notice $ND::nick $text");
 	}
 }
 
+sub getScan {
+	my ($msg, $command) = @_;
+
+	my ($t, $x, $y, $z, $type, $tick);
+	if (defined $msg && $msg =~ /^([pdunja]) (\d+)\D+(\d+)\D+(\d+)(?: (\d+))?/){
+		$t = $1;
+		$type =$scantypes[$scanid{$1}-1];
+		($x,$y,$z) = ($2,$3,$4);
+		$tick = $5;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: $command type X:Y:Z [tick]"
+			. " | type is the first character in the scan name, like p for planet scan."
+			. " Specify a tick if you want scans older than the specified tick."
+		);
+		return;
+	}
+
+	if (my $user = member){
+		my $scan = $ND::DBH->selectrow_hashref(q{
+SELECT id, scan_id, tick FROM scans
+WHERE type = $1 AND planet = planetid($2,$3,$4,0) AND COALESCE(tick < $5,TRUE)
+ORDER BY tick DESC LIMIT 1
+			},undef,$type,$x,$y,$z,$tick);
+		unless ($scan->{id}){
+			$ND::server->command("notice $ND::nick No such scan");
+		}
+		my $text = '|';
+		if ($t =~ /[uja]/){
+			my $fid = $ND::DBH->selectrow_array(q{
+SELECT fid FROM fleet_scans WHERE id = $1
+				},undef,$scan->{id});
+			my $ships = $ND::DBH->prepare(q{
+SELECT ship,amount FROM fleet_ships WHERE fid = $1 ORDER BY num
+				});
+			$ships->execute($fid);
+			while (my $ship = $ships->fetchrow_hashref){
+				$text .= " $ship->{ship} $ship->{amount} |"
+			}
+		}else{
+			$text = "http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}";
+		}
+		$ND::server->command("notice $ND::nick $ND::B$type$ND::O scan of $x:$y:$z "
+			. "($scan->{scan_id} pt: $ND::B$scan->{tick}$ND::O) $text");
+	}
+}
+
+
 1;