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){
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);
$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);
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
)
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}){
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)
{