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

diff --git a/Scans.pm b/Scans.pm
index 1315e22..038286b 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/;
 
 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,11 +69,129 @@ 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");
+	}
+}
+
+our %scanid = (p => 1, l => 2, d => 3, u => 4, n => 5, j => 7, a => 8);
+
+our @scantypes = ('Planet','Landing', 'Development'
+	,'Unit', 'News', 'Incoming', 'Jumpgate', 'Advanced Unit');
+
+sub reqScan {
+	my ($msg, $command) = @_;
+
+	my ($x, $y, $z, $type, $typeid);
+	if (defined $msg && $msg =~ /^([pdunja]) (\d+)\D+(\d+)\D+(\d+) (\S.*)/){
+		$typeid = $scanid{$1};
+		$type = $scantypes[$typeid-1];
+		($x,$y,$z) = ($2,$3,$4);
+		$msg = $5;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: $command type X:Y:Z message"
+			. " | type is the first character in the scan name, like p for planet scan, message is a message to scanners, like plz or thanks like plz or thanks");
+		return;
+	}
+
+	if (my $user = member){
+
+		my $planet = $ND::DBH->selectrow_array(q{SELECT planetid($1,$2,$3,$4)}
+			,undef,$x,$y,$z,$ND::tick);
+
+		my $query = $ND::DBH->prepare(q{SELECT scan_id
+			FROM scans
+			WHERE planet = $1 AND type = $2 AND tick >= $3});
+		$query->execute($planet,$type,$ND::tick);
+
+		if (my $scan = $query->fetchrow_hashref){
+			$ND::server->command("notice $ND::nick scan already exist: "
+				. "http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}");
+		}else{
+			my $req = $ND::DBH->prepare(q{SELECT * FROM scan_requests
+				WHERE uid = $1 AND planet = $2
+					AND type = $3 AND NOT sent
+			});
+			$req->execute($user->{uid},$planet,$type);
+
+			my $id;
+			if(my $scan = $req->fetchrow_hashref){
+				$req = $ND::DBH->prepare(q{UPDATE scan_requests
+					SET nick = $1, tick = tick(), time = NOW()
+					WHERE id = $2});
+				$req->execute($ND::nick,$scan->{id});
+				$id = $scan->{id};
+			}else{
+				$req = $ND::DBH->prepare(q{INSERT INTO scan_requests
+					(uid,nick,planet,type) VALUES($1,$2,$3,$4)
+					RETURNING (id)});
+				$req->execute($user->{uid},$ND::nick,$planet,$type);
+				$id = $req->fetchrow;
+			}
+
+			if ($id){
+				$ND::server->command("msg $ND::scanchan "
+					. "$ND::B$id$ND::O http://game.planetarion.com/waves.pl?id=$typeid&x=$x&y=$y&z=$z"
+					. " ($x:$y:$z $type) | <$ND::nick> $msg"
+				);
+				$ND::server->command("notice $ND::nick sent request ($x:$y:$z $type)");
+			}else{
+				$ND::server->command("notice $ND::nick something went wrong..");
+			}
+
+		}
+	}
+}
+
+our %scantypes;
+{
+	my $i = 1;
+	%scantypes = map {$_ => $i++} @scantypes;
+}
+
+sub scanReqs {
+	my ($msg, $command) = @_;
+
+	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
+			WHERE sr.time > NOW() - '30 min'::INTERVAL
+				AND NOT EXISTS (SELECT scan_id FROM scans
+					WHERE planet = sr.planet
+						AND type = sr.type
+						AND tick >= sr.tick
+				)
+				AND type <> ALL($1)
+			GROUP BY x,y,z,type
+			ORDER BY id
+			});
+		$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;
+		$ND::server->command("notice $ND::nick $text");
 	}
 }