X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Scans.pm;h=2b33361c65413da1665e70fe11e78f6a8e6fe3a4;hb=f4fda6de68d23833ffe61c81f29177cc210b3825;hp=1315e22408b2875ef6357fe05f46660fe2501990;hpb=ec80f6c0dba1fd56a63d591e89f6368d468912f7;p=NDIRC.git

diff --git a/Scans.pm b/Scans.pm
index 1315e22..2b33361 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -25,21 +25,20 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addScan addScanGroup sendScan/;
+our @EXPORT = qw/addScan addScanGroup sendScan reqScan scanReqs getScan/;
 
 sub addScan {
 	my ($id,$verbose) = @_;
-	DB();
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE 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,"type") 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;
-					$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");
 				}
@@ -51,15 +50,14 @@ sub addScan {
 }
 sub addScanGroup {
 	my ($id,$verbose) = @_;
-	DB();
 	if (1){
-		unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE type = 'group' 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,"type",scan) VALUES (?,tick(),'group',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");
 				}
@@ -71,12 +69,66 @@ sub addScanGroup {
 }
 
 sub sendScan {
-	my ($target,$msg) = @_;
-	DB();
+	my ($msg, $command) = @_;
+	my ($target,$mess);
+	if (defined $msg && $msg =~ /^(\S+) (.*)$/){
+		$target = $1;
+		$mess = $2;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: $command nick message");
+		return;
+	}
 	if (scanner()){
-		$ND::server->command("msg $target ".chr(2).$msg.chr(3)."4 (reply with /msg $ND::scanchan)");
-		$ND::server->command("msg $ND::target ${ND::C}3$1 << $2");
+		$ND::server->command("msg $target ".chr(2).$mess.chr(3)."4 (reply with /msg $ND::scanchan)");
+		$ND::server->command("msg $ND::target ${ND::C}3$target << $mess");
 	}
 }
 
+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;