X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FScans.pm;h=31eea44fb9f940800b58132568c4d9cfc673f0a2;hb=1ccb344994c1b517c662da9f236cf1c640780177;hp=2747acbb2abc5700770692bbe35c42f3acba48a3;hpb=df43148278c85c28726accbec2421688260661b7;p=NDIRC.git

diff --git a/Commands/Scans.pm b/Commands/Scans.pm
index 2747acb..31eea44 100644
--- a/Commands/Scans.pm
+++ b/Commands/Scans.pm
@@ -54,10 +54,14 @@ sub gs
 
 	my $planet = $c->model->selectrow_array(q{SELECT planetid($1,$2,$3,tick())}
 		,undef,$x,$y,$z);
+	unless ($planet){
+		$c->reply("There is no planet with coords $x:$y:$z, try again after the tick.");
+		return;
+	}
 
 	my $query = $c->model->prepare(q{SELECT scan_id
 		FROM scans
-		WHERE planet = $1 AND type = $2 AND tick >= tick()});
+		WHERE pid = $1 AND type = $2 AND tick >= tick()});
 	$query->execute($planet,$type);
 
 	if (my $scan = $query->fetchrow_hashref){
@@ -67,7 +71,7 @@ sub gs
 		my $req = $c->model->prepare(q{
 SELECT * FROM scan_requests
 WHERE uid = (SELECT uid FROM users WHERE hostmask ILIKE $1)
-	AND planet = $2 AND type = $3 AND NOT sent
+	AND pid = $2 AND type = $3 AND NOT sent
 		});
 		$req->execute($c->host,$planet,$type);
 
@@ -81,7 +85,7 @@ WHERE id = $2
 			$id = $scan->{id};
 		}else{
 			$req = $c->model->prepare(q{
-INSERT INTO scan_requests (uid,nick,planet,type)
+INSERT INTO scan_requests (uid,nick,pid,type)
 VALUES((SELECT uid FROM users WHERE hostmask ILIKE $1),$2,$3,$4) RETURNING (id)
 			});
 			$req->execute($c->host,$c->nick,$planet,$type);
@@ -124,10 +128,10 @@ sub scanreqs
 	my $reqs = $c->model->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
+	JOIN current_planet_stats p USING (pid)
 WHERE sr.time > NOW() - '30 min'::INTERVAL
 	AND NOT EXISTS (SELECT scan_id FROM scans
-		WHERE planet = sr.planet
+		WHERE pid = sr.pid
 			AND type = sr.type
 			AND tick >= sr.tick
 	)
@@ -157,7 +161,7 @@ sub scan
 
 	my $scan = $c->model->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)
+WHERE type = $1 AND pid = 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}){
@@ -194,8 +198,54 @@ sub anon
 	my ($self, $c, $msg) = @_;
 	my ($target,$mess) = $msg =~ /^(\S+) (.*)$/ or die 'ARGS';
 
-	$c->message("msg $target", "<b>$mess</b> <c04>(reply with /msg $ND::scanchan)</c>");
-	$c->message("msg $ND::scanchan", "<c03>$target << $mess</c>");
+	$c->message("msg $target", "<b>$mess</b> <c04>(reply with /msg "
+		.$c->channel.")</c>");
+	$c->message("msg ".$c->channel, "<c03>$target << $mess</c>");
+}
+
+sub addscan
+	: Help(syntax: .addscan list of scans)
+{
+	my ($self, $c, $msg) = @_;
+	my $dbh = $c->model;
+
+	my $oldscan = $dbh->prepare(q{
+SELECT scan_id FROM scans
+WHERE groupscan = $1 AND scan_id = LOWER($2) AND tick >= tick() - 168
+		});
+	my $addscan = $dbh->prepare(q{
+INSERT INTO scans (scan_id,tick,groupscan,uid) VALUES (LOWER($1),tick(),$2,COALESCE($3,-1))
+		});
+	my $user = $dbh->selectrow_hashref(q{SELECT uid,username, scan_points, tick()
+		FROM users WHERE hostmask ILIKE ? },undef,$c->host);
+	my $groupscans = 0;
+	my $scans = 0;
+	eval {
+		$dbh->begin_work;
+		while ($msg =~ m{/.+?scan(_id|_grp)?=(\w+)}g){
+			my $id = $2;
+			my $group = ($1 ~~ /_grp/ || 0);
+			unless($dbh->selectrow_array($oldscan,undef,$group,$id)){
+				$addscan->execute($id,$group,$user->{uid});
+				if ($group){
+					$groupscans++;
+				}else{
+					$scans++;
+				}
+			}
+		}
+		if ($user->{uid} && ($scans || $groupscans)){
+			$dbh->do(q{UPDATE users SET scan_points = scan_points + $2 WHERE uid = $1}
+				,undef,$user->{uid},$scans);
+			my $points = $user->{scan_points} + $scans;
+			$c->reply("Added $scans scans and $groupscans groupscans, $points in total.");
+		}
+		$dbh->commit;
+	};
+	if ($@){
+		$dbh->rollback;
+		die $@;
+	}
 }
 
 1;