X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=sidebyside;f=Scans.pm;h=a22983dd3bfb836f66a635b8dd37be1adaccc1b2;hb=c8e65de85f3c2724a5290e0ee612b83e7f63aea0;hp=eec0828561eac5445fb877bc5286bcbfec266b84;hpb=dfea4968ee6ecf37dda558340e26261a2e3b97f0;p=NDIRC.git diff --git a/Scans.pm b/Scans.pm index eec0828..a22983d 100644 --- a/Scans.pm +++ b/Scans.pm @@ -25,25 +25,20 @@ require Exporter; our @ISA = qw/Exporter/; -our @EXPORT = qw/addScan addScanGroup sendScan reqScan scanReqs/; +our @EXPORT = qw/addScan addScanGroup sendScan/; sub addScan { - my ($id,$verbose, $quiet) = @_; + my ($id,$verbose) = @_; if (1){ - unless ($ND::DBH->selectrow_array(q{SELECT scan_id FROM scans WHERE NOT groupscan AND 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,uid) 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; - if ($quiet){ - $ND::server->command("msg $ND::target Added scan, points now $user[2]"); - } - else{ - $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"); } @@ -56,13 +51,13 @@ sub addScan { sub addScanGroup { my ($id,$verbose) = @_; if (1){ - unless ($ND::DBH->selectrow_array("SELECT scan_id FROM scans WHERE groupscan 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,groupscan,uid) VALUES (?,tick(),true,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"); } @@ -89,107 +84,6 @@ sub sendScan { } } -our %scanid = (p => 1, s => 2, t => 3, u => 4, n => 5, j => 7, a => 8); - -our @scantypes = ('Planet','Surface Analysis', 'Technology Analysis' - ,'Unit', 'News', 'Incoming', 'Jumpgate', 'Advanced Unit'); - -sub reqScan { - my ($msg, $command) = @_; - - my ($x, $y, $z, $type, $typeid); - if (defined $msg && $msg =~ /^([pstunja]) (\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, 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 $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 - ) - GROUP BY x,y,z,type - ORDER BY id - }); - $reqs->execute; - 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"); - } -} 1;