use strict;
use warnings;
+use feature ":5.10";
+use Try::Tiny;
use parent 'Catalyst::Controller';
use NDWeb::Include;
$c->stash(error => $c->flash->{error});
- $c->stash(u => $dbh->selectrow_hashref(q{SELECT planet,defense_points
+ $c->stash(u => $dbh->selectrow_hashref(q{SELECT pid AS planet,defense_points
,attack_points,scan_points,humor_points
, (attack_points+defense_points+scan_points/20)::NUMERIC(5,1) as total_points
- , sms,rank,hostmask,call_if_needed,sms_note
- FROM users WHERE uid = ?
+ , sms,rank,hostmask,call_if_needed,sms_note,defprio
+ FROM users_defprio WHERE uid = ?
},undef,$c->user->id)
);
- $c->stash(groups => $dbh->selectrow_array(q{SELECT array_accum(groupname)
+ $c->stash(groups => $dbh->selectrow_array(q{SELECT array_agg(groupname)
FROM groups g NATURAL JOIN groupmembers gm
WHERE uid = $1
},undef,$c->user->id)
);
- $c->stash(p => $dbh->selectrow_hashref(q{SELECT id,x,y,z, ruler, planet,race,
+ $c->stash(p => $dbh->selectrow_hashref(q{SELECT pid AS id,x,y,z, ruler, planet,race,
size, size_gain, size_gain_day,
score,score_gain,score_gain_day,
value,value_gain,value_gain_day,
valuerank,valuerank_gain,valuerank_gain_day,
xprank,xprank_gain,xprank_gain_day
from current_planet_stats_full p
- WHERE id = ?
+ WHERE pid = ?
},undef,$c->user->planet)
);
my $calls = $dbh->prepare(q{
- SELECT id,landing_tick,dc,curreta
- ,array_accum(race::text) AS race
- ,array_accum(amount) AS amount
- ,array_accum(eta) AS eta
- ,array_accum(shiptype) AS shiptype
- ,array_accum(coords) AS attackers
- FROM (SELECT c.id, c.landing_tick
- ,dc.username AS dc, (c.landing_tick - tick()) AS curreta
- ,p2.race, i.amount, i.eta, i.shiptype, p2.alliance
- ,coords(p2.x,p2.y,p2.z)
- FROM calls c
- LEFT OUTER JOIN incomings i ON i.call = c.id
- LEFT OUTER JOIN current_planet_stats p2 ON i.sender = p2.id
- LEFT OUTER JOIN users dc ON c.dc = dc.uid
- WHERE c.member = $1 AND c.landing_tick >= tick()
- GROUP BY c.id, c.landing_tick, dc.username
- ,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z
- ) c
- GROUP BY id, landing_tick,dc,curreta
+SELECT * FROM defcalls
+WHERE uid = $1 AND landing_tick >= tick()
+ORDER BY landing_tick DESC
});
-
$calls->execute($c->user->id);
$c->stash(calls => $calls->fetchall_arrayref({}) );
});
$announcements->execute($c->user->id);
$c->stash(announcements => $announcements->fetchall_arrayref({}) );
+
+ my ($attackgroups) = $dbh->selectrow_array(q{
+SELECT array_agg(gid) FROM groupmembers WHERE gid IN ('x','y','z') AND uid = $1
+ }, undef, $c->user->id);
+ $c->stash(attackgroups => $attackgroups);
+
}
sub posthostupdate : Local {
$c->res->redirect($c->uri_for(''));
}
+sub postattackgroups : Local {
+ my ( $self, $c ) = @_;
+ my $dbh = $c->model;
+
+ my @groups = $c->req->param('class');
+ $dbh->do(q{DELETE FROM groupmembers WHERE gid IN ('x','y','z') AND gid <> ALL($1) AND uid = $2
+ },undef, \@groups, $c->user->id);
+
+ $dbh->do(q{INSERT INTO groupmembers (uid,gid) (
+ SELECT $2, gid FROM unnest($1::text[]) AS gid WHERE gid IN ('x','y','z')
+ EXCEPT
+ SELECT uid,gid FROM groupmembers WHERE uid = $2
+ )},undef, \@groups, $c->user->id);
+
+ $c->res->redirect($c->uri_for(''));
+}
+
sub postsmsupdate : Local {
my ( $self, $c ) = @_;
my $dbh = $c->model;
if ($c->user->planet){
$c->flash(error => 'You already have a planet set.'
.' Contact a HC if they need to be changed');
- }elsif ($c->req->param('planet') =~ m/(\d+)\D+(\d+)\D+(\d+)/){
+ }elsif (my ($x,$y,$z) = $c->req->param('planet') =~ m/(\d+)\D+(\d+)\D+(\d+)/){
my $planet = $dbh->selectrow_array(q{SELECT planetid($1,$2,$3,TICK())
- },undef,$1,$2,$3);
+ },undef,$x,$y,$z);
if ($planet){
- $dbh->do(q{UPDATE users SET planet = ? WHERE uid = ?
- },undef, $planet , $c->user->id);
+ eval {
+ $dbh->do(q{UPDATE users SET pid = ? WHERE uid = ?
+ },undef, $planet , $c->user->id);
+ };
+ given ($@){
+ when (''){}
+ when (/duplicate key value violates/){
+ $c->flash(error => "The coords $x:$y:$z are already in use. Talk to hc if these are really your coords.")
+ }
+ default {
+ $c->flash(error => $@)
+ }
+ }
}else{
- $c->flash(error => "No planet at coords: $1:$2:$3");
+ $c->flash(error => "No planet at coords: $x:$y:$z");
}
}else{
$c->flash(error => $c->req->param('planet') . " are not valid coords.");
$dbh->begin_work;
eval{
my $insert = $dbh->prepare(q{INSERT INTO fleets
- (planet,name,mission,tick,amount)
+ (pid,name,mission,tick,amount)
VALUES (?,'Main','Full fleet',tick(),?) RETURNING fid});
my ($id) = $dbh->selectrow_array($insert,undef
,$c->user->planet,$amount);
if ($c->req->param('cmd') eq 'Recall Fleets'){
my $updatefleets = $dbh->prepare(q{UPDATE launch_confirmations
SET back = tick() + (tick() - (landing_tick - eta))
- WHERE uid = ? AND fid = ? AND back > tick()+eta
+ WHERE uid = ? AND fid = ? AND back >= tick()+eta
});
for my $param ($c->req->param()){
INSERT INTO irc_requests (uid,channel,message) VALUES($1,$2,$3)
});
$query->execute($c->user->id,$c->req->param('channel'),$c->req->param('message'));
- system 'killall','-USR1', 'irssi';
+ $c->signal_bots;
$c->flash(reply => "Msg sent to: ".$c->req->param('channel'));
$c->res->redirect($c->uri_for('ircrequest'));
my ( $self, $c, $order ) = @_;
my $dbh = $c->model;
- if ($order && $order =~ /^((?:defense|attack|total|humor|scan|raid)_points)$/){
+ $order //= 'total_points';
+ if ($order ~~ /^((?:defense|attack|total|humor|scan|raid)_points)$/
+ || $order ~~ /^(defprio)$/){
$order = "$1 DESC";
}else{
$order = 'total_points DESC';
my $limit = 'LIMIT 10';
$limit = '' if $c->check_user_roles(qw/members_points_nolimit/);
- my $query = $dbh->prepare(qq{SELECT username,defense_points,attack_points
- ,scan_points,humor_points
- ,(attack_points+defense_points+scan_points/20)::NUMERIC(4,0) as total_points
- , count(NULLIF(rc.launched,FALSE)) AS raid_points
- FROM users u LEFT OUTER JOIN raid_claims rc USING (uid)
- WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
- GROUP BY username,defense_points,attack_points,scan_points,humor_points,rank
- ORDER BY $order $limit});
+ my $query = $dbh->prepare(q{
+SELECT username,defense_points,attack_points
+ ,scan_points,humor_points,defprio
+ ,(attack_points+defense_points+scan_points/20)::NUMERIC(4,0) as total_points
+ , count(NULLIF(rc.launched,FALSE)) AS raid_points
+FROM users_defprio u LEFT OUTER JOIN raid_claims rc USING (uid)
+WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
+GROUP BY username,defense_points,attack_points,scan_points,humor_points,defprio
+ORDER BY } . "$order $limit"
+ );
$query->execute;
- my @members;
- while (my $member = $query->fetchrow_hashref){
- push @members,$member;
+ $c->stash(members => $query->fetchall_arrayref({}));
+}
+
+sub stats : Local {
+ my ( $self, $c, $order ) = @_;
+ my $dbh = $c->model;
+
+ $order //= 'score';
+ if ($order ~~ /^(scre|value|xp|size|race)$/){
+ $order = "$1rank";
+ }else{
+ $order = 'scorerank';
}
- $c->stash(members => \@members);
+ $order .= ',race' if $order eq 'racerank';
+
+ my $limit = 'LIMIT 10';
+ $limit = '' if $c->check_user_roles(qw/members_points_nolimit/);
+
+ my ($races) = $dbh->selectrow_array(q{SELECT enum_range(null::race)::text[]});
+ $c->stash(races => $races);
+ my $query = $dbh->prepare(q{
+SELECT nick
+ ,rank() OVER(ORDER BY score DESC) AS scorerank
+ ,rank() OVER(ORDER BY value DESC) AS valuerank
+ ,rank() OVER(ORDER BY xp DESC) AS xprank
+ ,rank() OVER(ORDER BY size DESC) AS sizerank
+ ,rank() OVER(PARTITION BY race ORDER BY score DESC) AS racerank
+ ,race
+FROM current_planet_stats
+WHERE alliance = 'NewDawn'
+ AND race = ANY($1)
+ORDER BY } . "$order $limit");
+ my @race = $c->req->param('race');
+ my %race = map { $_ => 1 } @race;
+ $c->stash(race => \%race);
+ unless (@race){
+ @race = @$races;
+ }
+ $query->execute(\@race);
+ $c->stash(members => $query->fetchall_arrayref({}));
}
sub addintel : Local {
}
}
+ my ($coords,$tick) = $c->model->selectrow_array(q{
+SELECT coords(x,y,z), tick() FROM current_planet_stats WHERE pid = $1
+ }, undef, $c->user->planet);
+
+ $c->req->param(message => "[i]Posted by $coords at tick $tick [/i]\n\n" . $c->req->param('message'));
$c->forward('/forum/insertThread',[12]);
$c->forward('/forum/insertPost',[$c->stash->{thread}]);
$c->flash(intelmessage => 1);
my ( $self, $c ) = @_;
my $dbh = $c->model;
- eval {
- my $missions = $c->req->param('mission');
+ try {
my $findplanet = $dbh->prepare("SELECT planetid(?,?,?,?)");
- my $findattacktarget = $dbh->prepare(q{SELECT c.target,c.wave,c.launched
- FROM raid_claims c
- JOIN raid_targets t ON c.target = t.id
- JOIN raids r ON t.raid = r.id
- WHERE c.uid = ? AND r.tick+c.wave-1 = ? AND t.planet = ?
- AND r.open AND not r.removed
- });
- my $finddefensetarget = $dbh->prepare(q{SELECT c.id FROM calls c
- JOIN users u ON c.member = u.uid
- WHERE u.planet = $1 AND c.landing_tick = $2
- });
- my $informDefChannel = $dbh->prepare(q{INSERT INTO defense_missions
- (fleet,call) VALUES (?,?)
- });
- my $addattackpoint = $dbh->prepare(q{UPDATE users SET
- attack_points = attack_points + 1 WHERE uid = ?
- });
- my $launchedtarget = $dbh->prepare(q{UPDATE raid_claims SET launched = True
- WHERE uid = ? AND target = ? AND wave = ?
- });
my $addfleet = $dbh->prepare(q{INSERT INTO fleets
- (name,mission,planet,tick,amount)
- VALUES ($2,$3,(SELECT planet FROM users WHERE uid = $1),tick(),$4)
+ (name,mission,pid,tick,amount)
+ VALUES ($2,$3,(SELECT pid FROM users WHERE uid = $1),tick(),$4)
RETURNING fid
});
+ my $updatefleet = $dbh->prepare(q{
+UPDATE launch_confirmations SET back = $2 WHERE fid = $1
+ });
my $addconfirmation = $dbh->prepare(q{INSERT INTO launch_confirmations
- (fid,uid,target,landing_tick,eta,back) VALUES ($1,$2,$3,$4,$5,$6)
+ (fid,uid,pid,landing_tick,eta,back) VALUES ($1,$2,$3,$4,$5,$6)
});
my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (fid,ship,amount)
VALUES (?,?,?)
my $log = $dbh->prepare(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
(SELECT ftid FROM users WHERE uid = $1),$1,$2)
});
- my @missions;
$dbh->begin_work;
- while ($missions && $missions =~ m/([^\n]+)\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)
- \s+\((?:(\d+)\+)?(\d+)\).*?(?:\d+hrs\s+)?\d+mins?\s+
- (Attack|Defend|Return|Fake\ Attack|Fake\ Defend)
- (.*?)
- (?:Launching\ in\ tick\ (\d+),\ arrival\ in\ tick\ (\d+)
- |ETA:\ \d+,\ Return\ ETA:\ (\d+)
- |Return\ ETA:\ (\d+)
- )/sgx){
- next if $10 eq 'Return';
- my %mission;
- my $name = $1;
- my $tick = $c->stash->{TICK}+$9;
- $tick += $8 if defined $8;
- $tick = $13 if defined $13;
- my $eta = $9;
- $eta += $14 if defined $14;
- my $mission = $10;
- my $x = $5;
- my $y = $6;
- my $z = $7;
- my $back = $tick + $eta - 1;
- $mission{tick} = $tick;
- $mission{mission} = $mission;
- $mission{target} = "$x:$y:$z";
- $mission{back} = $back;
-
- my ($planet_id) = $dbh->selectrow_array($findplanet,undef,$x,$y,$z,$c->stash->{TICK});
-
- my $findtarget = $finddefensetarget;
- if ($mission eq 'Attack'){
- $findtarget = $findattacktarget;
- $findtarget->execute($c->user->id,$tick,$planet_id);
- }elsif ($mission eq 'Defend'){
- $findtarget = $finddefensetarget;
- $findtarget->execute($planet_id,$tick);
+ my @missions = parseconfirmations($c->req->param('mission'), $c->stash->{TICK});
+ for my $m (@missions){
+ if ($m->{mission} eq 'Return'){
+ $c->forward("addReturnFleet", [$m]);
+ $updatefleet->execute($m->{fid},$m->{back}) if $m->{fid};
+ next;
}
-
- my $ships = $11;
- my @ships;
- my $amount = 0;
- while ($ships =~ m/((?:\w+ )*\w+)\s+\w+\s+(?:(?:\w+|-)\s+){3}(?:Steal|Normal|Emp|Normal\s+Cloaked|Pod|Structure Killer)\s+(\d+)/g){
- $amount += $2;
- push @ships,{ship => $1, amount => $2};
+ $m->{pid} = $dbh->selectrow_array($findplanet,undef,@{$m->{target}},$c->stash->{TICK});
+ unless ($m->{pid}){
+ $m->{warning} = "No planet at @{$m->{target}}, try again next tick.";
+ next;
}
- $mission{ships} = \@ships;
- if ($amount == 0){
- warn "No ships in: $ships";
+ $c->forward("findDuplicateFleet", [$m]);
+ if ($m->{match}){
+ $m->{warning} = "Already confirmed this fleet, changing back to to match this paste";
+ $updatefleet->execute($m->{fid},$m->{back});
next;
}
- my $fleet = $dbh->selectrow_array($addfleet,undef,$c->user->id,$name
- ,$mission,$amount);
- $addconfirmation->execute($fleet,$c->user->id,$planet_id,$tick,$eta,$back);
- $mission{fleet} = $fleet;
- for my $ship (@ships){
- $addships->execute($fleet,$ship->{ship},$ship->{amount});
- }
- if ($findtarget->rows == 0){
- $mission{warning} = 'No matching target!';
- }elsif ($mission eq 'Attack'){
- my $claim = $findtarget->fetchrow_hashref;
- if ($claim->{launched}){
- $mission{warning} = "Already launched on this target:$claim->{target},$claim->{wave},$claim->{launched}";
- }else{
- $addattackpoint->execute($c->user->id);
- $launchedtarget->execute($c->user->id,$claim->{target},$claim->{wave});
- $mission{warning} = "OK:$claim->{target},$claim->{wave},$claim->{launched}";
- $log->execute($c->user->id,"Gave attack point for confirmation on $mission mission to $x:$y:$z, landing tick $tick");
- }
- }elsif ($mission eq 'Defend'){
- my $call = $findtarget->fetchrow_hashref;
- $informDefChannel->execute($fleet,$call->{id});
+ $m->{fleet} = $dbh->selectrow_array($addfleet,undef,$c->user->id,$m->{name}
+ ,$m->{mission},$m->{amount});
+ if ($m->{mission} eq 'Attack'){
+ $c->forward("addAttackFleet", [$m]);
+ }elsif ($m->{mission} eq 'Defend'){
+ $c->forward("addDefendFleet", [$m]);
}
- $log->execute($c->user->id,"Pasted confirmation for $mission mission to $x:$y:$z, landing tick $tick");
- push @missions,\%mission;
+ $addconfirmation->execute($m->{fleet},$c->user->id,$m->{pid},$m->{tick},$m->{eta},$m->{back});
+
+ for my $ship (@{$m->{ships}}){
+ $addships->execute($m->{fleet},$ship->{ship},$ship->{amount});
+ }
+ $log->execute($c->user->id,"Pasted confirmation for $m->{mission} mission to @{$m->{target}}, landing tick $m->{tick}");
}
$dbh->commit;
$c->flash(missions => \@missions);
- };
- if ($@){
+ $c->signal_bots;
+ } catch {
$dbh->rollback;
- if ($@ =~ m/insert or update on table "fleet_ships" violates foreign key constraint "fleet_ships_ship_fkey"\s+DETAIL:\s+Key \(ship\)=\(([^)]+)\)/){
+ when (/insert or update on table "fleet_ships" violates foreign key constraint "fleet_ships_ship_fkey"\s+DETAIL:\s+Key \(ship\)=\(([^)]+)\)/){
$c->flash( error => "'$1' is NOT a valid ship");
- }else{
- $c->flash( error => $@);
}
+ default{
+ $c->flash( error => $_);
+ }
+ };
+ $c->res->redirect($c->uri_for('launchConfirmation'));
+}
+
+sub parseconfirmations {
+ my ( $missions, $tick ) = @_;
+ return unless $missions;
+ my @missions;
+ while ($missions =~ m/\s*([^\n]+?)\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)
+ \s+\((?:(\d+)\+)?(\d+)\).*?(?:\d+hrs\s+)?\d+mins?\s+
+ (Attack|Defend|Return|Fake\ Attack|Fake\ Defend)
+ (.*?)
+ (?:Launching\ in\ tick\ (\d+),\ arrival\ in\ tick\ (\d+)
+ |ETA:\ \d+,\ Return\ ETA:\ (\d+)
+ |Return\ ETA:\ (\d+)
+ )/sgx){
+ my $tick = $tick;
+ $tick += $9;
+ $tick += $8 if defined $8;
+ $tick = $13 if defined $13;
+ my $eta = $9;
+ $eta += $14 if defined $14;
+ my %mission = (
+ name => $1,
+ mission => $10,
+ tick => $tick,
+ eta => $eta,
+ back => $10 eq 'Return' ? $tick : $tick + $eta - 1,
+ target => [$5,$6,$7],
+ from => [$2,$3,$4],
+ );
+ my $ships = $11;
+ my @ships;
+ $mission{amount} = 0;
+ while ($ships =~ m/((?:\w+ )*\w+)\s+\w+\s+(?:(?:\w+|-)\s+){3}(?:Steal|Normal|Emp|Normal\s+Cloaked|Pod|Structure Killer)\s+(\d+)/g){
+ $mission{amount} += $2;
+ push @ships,{ship => $1, amount => $2};
+ }
+ $mission{ships} = \@ships;
+
+ if ($mission{amount} == 0){
+ warn "No ships in: $ships";
+ next;
+ }
+ push @missions,\%mission;
}
+ return @missions;
+}
+
+sub findDuplicateFleet : Private {
+ my ( $self, $c, $m ) = @_;
+ my $dbh = $c->model;
+
+ my $findfleet = $dbh->prepare(q{
+SELECT fid FROM fleets f
+ JOIN launch_confirmations lc USING (fid)
+WHERE uid = $1 AND name = $2 AND mission = $3 AND amount = $4
+ AND lc.pid = $5 AND landing_tick = $6
+ });
+ my $fid = $dbh->selectrow_array($findfleet,undef,$c->user->id,$m->{name}
+ ,$m->{mission},$m->{amount}, $m->{pid}, $m->{tick});
+ $c->forward("matchShips", [$m,$fid]);
+ $m->{fid} = $fid if $m->{match};
+}
+
+sub addAttackFleet : Private {
+ my ( $self, $c, $m ) = @_;
+ my $dbh = $c->model;
+
+ my $findattacktarget = $dbh->prepare(q{
+SELECT c.target,c.wave,c.launched
+FROM raid_claims c
+ JOIN raid_targets t ON c.target = t.id
+ JOIN raids r ON t.raid = r.id
+WHERE c.uid = ? AND r.tick+c.wave-1 = ? AND t.pid = ?
+ AND r.open AND not r.removed
+ });
+ my $launchedtarget = $dbh->prepare(q{
+UPDATE raid_claims SET launched = TRUE
+WHERE uid = ? AND target = ? AND wave = ?
+ });
+ my $claim = $dbh->selectrow_hashref($findattacktarget,undef,$c->user->id,$m->{tick},$m->{pid});
+ if ($claim->{launched}){
+ $m->{warning} = "Already launched on this target:$claim->{target},$claim->{wave},$claim->{launched}";
+ }elsif(defined $claim->{launched}){
+ $launchedtarget->execute($c->user->id,$claim->{target},$claim->{wave});
+ $m->{warning} = "OK:$claim->{target},$claim->{wave},$claim->{launched}";
+ }else{
+ $m->{warning} = "You haven't claimed this target";
+ }
+}
+
+sub addDefendFleet : Private {
+ my ( $self, $c, $m ) = @_;
+ my $dbh = $c->model;
+
+ my $finddefensetarget = $dbh->prepare(q{
+SELECT call FROM calls c
+ JOIN users u USING (uid)
+WHERE u.pid = $1 AND c.landing_tick = $2
+ });
+ my $informDefChannel = $dbh->prepare(q{
+INSERT INTO defense_missions (fleet,call) VALUES (?,?)
+ });
+ my $call = $dbh->selectrow_hashref($finddefensetarget,undef,$m->{pid},$m->{tick});
+ if ($call->{call}){
+ $informDefChannel->execute($m->{fleet},$call->{call});
+ }else{
+ $m->{warning} = "No call for @{$m->{target}} landing tick $m->{tick}";
+ }
+}
+
+sub addReturnFleet : Private {
+ my ( $self, $c, $m ) = @_;
+ my $dbh = $c->model;
+
+ my $findfleet = $dbh->prepare(q{
+SELECT fid FROM fleets f
+ JOIN launch_confirmations lc USING (fid)
+WHERE uid = $1 AND name = $2 AND amount = $3
+ AND back >= $4
+ });
+ my $fid = $dbh->selectrow_array($findfleet,undef,$c->user->id,$m->{name}
+ ,$m->{amount}, $m->{tick});
+ $c->forward("matchShips", [$m,$fid]);
+ if ($m->{match}){
+ $m->{fid} = $fid;
+ $m->{warning} = "Return fleet, changed back tick to match the return eta.";
+ } else {
+ $m->{warning} = "Couldn't find a fleet matching this returning fleet. Recall manually.";
+ }
+}
+
+sub matchShips : Private {
+ my ( $self, $c, $m, $fid ) = @_;
+ return unless $fid;
+ my $dbh = $c->model;
+
+ my $ships = $dbh->prepare(q{
+SELECT ship, amount FROM fleet_ships WHERE fid = $1 ORDER BY num
+ });
+ $ships->execute($fid);
+ for my $s (@{$m->{ships}}){
+ my $s2 = $ships->fetchrow_hashref;
+ return unless $s->{ship} eq $s2->{ship} && $s->{amount} == $s2->{amount};
+ }
+ $m->{match} = 1;
- $c->res->redirect($c->uri_for('launchConfirmation'));
}
sub defenders : Local {
my $dbh = $c->model;
my $defenders = $dbh->prepare(q{
-SELECT uid,u.planet,username, to_char(NOW() AT TIME ZONE timezone,'HH24:MI') AS time
+SELECT uid,pid AS planet,username, to_char(NOW() AT TIME ZONE timezone,'HH24:MI') AS time
,sms_note, call_if_needed, race, timezone
FROM users u
- JOIN current_planet_stats p ON p.id = u.planet
-WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
-ORDER BY call_if_needed DESC, LOWER(username)
+ JOIN current_planet_stats p USING (pid)
+WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
+ORDER BY call_if_needed DESC, username
});
$defenders->execute;
my $available = $dbh->prepare(q{
-SELECT ship,amount FROM available_ships WHERE planet = $1
+SELECT ship,amount FROM available_ships WHERE pid = $1
});
my @members;
my $query = $dbh->prepare(q{
(
SELECT DISTINCT ON (mission,name) fid,name,tick, NULL AS eta
- ,amount, NULL AS coords, planet AS target, NULL AS back
+ ,amount, NULL AS coords, pid AS target, NULL AS back
,NULL AS recalled, mission
FROM fleets f
- WHERE planet = $2 AND tick <= tick() AND tick >= tick() - 24
+ WHERE pid = $2 AND tick <= tick() AND tick >= tick() - 24
AND name IN ('Main','Advanced Unit') AND mission = 'Full fleet'
ORDER BY mission,name,tick DESC, fid DESC
) UNION (
SELECT fid,name,landing_tick AS tick, eta, amount
- , coords(x,y,z), target, back
+ , coords(x,y,z), lc.pid AS target, back
, (back <> landing_tick + eta - 1) AS recalled
,CASE WHEN landing_tick <= tick() OR (back <> landing_tick + eta - 1)
THEN 'Returning' ELSE mission END AS mission
- FROM fleets f
- JOIN launch_confirmations USING (fid)
- LEFT OUTER JOIN current_planet_stats t ON target = t.id
- WHERE uid = $1 AND f.planet = $2 AND back > tick()
+ FROM launch_confirmations lc
+ LEFT OUTER JOIN current_planet_stats t USING (pid)
+ JOIN fleets f USING (fid)
+ WHERE uid = $1 AND f.pid = $2 AND back > tick()
AND landing_tick - eta - 12 < tick()
)
});