Introduce a uid member for the context and use it intead of the host in commands

[NDIRC.git] / Commands / Scans.pm

diff --git a/Commands/Scans.pm b/Commands/Scans.pm
index 70420e9a33d100492b24f029bafe1cb71bf37052..ffc8e184023a0b31d09ce894de92346ae103cff3 100644 (file)
--- 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){
@@ -66,10 +70,10 @@ sub gs
        }else{
                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
+WHERE uid = $1
+       AND pid = $2 AND type = $3 AND NOT sent
                });
-               $req->execute($c->host,$planet,$type);
+               $req->execute($c->uid,$planet,$type);
 
                my $id;
                if(my $scan = $req->fetchrow_hashref){
@@ -81,15 +85,15 @@ WHERE id = $2
                        $id = $scan->{id};
                }else{
                        $req = $c->model->prepare(q{
-INSERT INTO scan_requests (uid,nick,planet,type)
-VALUES((SELECT uid FROM users WHERE hostmask ILIKE $1),$2,$3,$4) RETURNING (id)
+INSERT INTO scan_requests (uid,nick,pid,type)
+VALUES($1,$2,$3,$4) RETURNING (id)
                        });
-                       $req->execute($c->host,$c->nick,$planet,$type);
+                       $req->execute($c->uid,$c->nick,$planet,$type);
                        $id = $req->fetchrow;
                }
 
                if ($id){
-                       $c->message("msg $ND::scanchan"
+                       $c->message(privmsg => $c->disp->targets->{scan}
                                ,"<b>$id</b> http://game.planetarion.com/waves.pl?id=$typeid&x=$x&y=$y&z=$z"
                                . " ($x:$y:$z $type) | <".$c->nick."> $msg"
                        );
@@ -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,9 +198,11 @@ 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(privmsg => $target, "<b>$mess</b> <c04>(reply with /msg "
+               .$c->channel.")</c>");
+       $c->message(privmsg => $c->channel, "<c03>$target << $mess</c>");
 }
+
 sub addscan
        : Help(syntax: .addscan list of scans)
 {
@@ -211,7 +217,7 @@ WHERE groupscan = $1 AND scan_id = LOWER($2) AND tick >= tick() - 168
 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);
+               FROM users WHERE uid = ? },undef,$c->uid);
        my $groupscans = 0;
        my $scans = 0;
        eval {