Removed the global variables for special chans, using targets hashref in Dispatcher...

[NDIRC.git] / Commands / Scans.pm

diff --git a/Commands/Scans.pm b/Commands/Scans.pm
index 1f5f347272b405baf7e579747b1888de081adab2..315903190c6ddf5b5e15e57f4d5c9cf9c3ed10a6 100644 (file)
--- a/Commands/Scans.pm
+++ b/Commands/Scans.pm
@@ -1,5 +1,5 @@
 #**************************************************************************
-#   Copyright (C) 2008 by Michael Andreen <harvATruinDOTnu>               *
+#   Copyright (C) 2009 by Michael Andreen <harvATruinDOTnu>               *
 #                                                                         *
 #   This program is free software; you can redistribute it and/or modify  *
 #   it under the terms of the GNU General Public License as published by  *
@@ -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);
@@ -89,7 +93,7 @@ VALUES((SELECT uid FROM users WHERE hostmask ILIKE $1),$2,$3,$4) RETURNING (id)
                }
 
                if ($id){
-                       $c->message("msg $ND::scanchan"
+                       $c->message(privmsg =>$c->disp->targets->{scans}
                                ,"<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}){
@@ -186,4 +190,62 @@ SELECT ship,amount FROM fleet_ships WHERE fid = $1 ORDER BY num
                . "($scan->{scan_id} pt: <b>$scan->{tick}</b>): $text");
 }
 
+sub anon
+       : Help(syntax: .anon nick message)
+       : Type(scan)
+       : ACL(irc_anonscan)
+{
+       my ($self, $c, $msg) = @_;
+       my ($target,$mess) = $msg =~ /^(\S+) (.*)$/ or die 'ARGS';
+
+       $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)
+{
+       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;