]> ruin.nu Git - ndwebbie.git/blobdiff - lib/NDWeb/Controller/Members.pm
Adding coords and tick to intel messages
[ndwebbie.git] / lib / NDWeb / Controller / Members.pm
index 9373b8f58b77b230212cf16d3c9e62704518545d..81a1238c2cdb8c2d270b3ffe22530bb6dbe24b54 100644 (file)
@@ -2,6 +2,7 @@ package NDWeb::Controller::Members;
 
 use strict;
 use warnings;
+use feature ":5.10";
 use parent 'Catalyst::Controller';
 
 use NDWeb::Include;
@@ -29,21 +30,21 @@ sub index : Path : Args(0) {
 
        $c->stash(error => $c->flash->{error});
 
-       $c->stash(comma => \&comma_value);
-       $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) as total_points
-                       , sms,rank,hostmask FROM users WHERE uid = ?
+                       , (attack_points+defense_points+scan_points/20)::NUMERIC(5,1) as total_points
+                       , 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,
@@ -53,61 +54,19 @@ sub index : Path : Args(0) {
                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({}) );
 
-       my $query = $dbh->prepare(q{SELECT f.id, coords(x,y,z), target, mission
-               , f.amount, tick, back
-FROM fleets f
-LEFT OUTER JOIN current_planet_stats p ON f.target = p.id
-WHERE NOT ingal AND f.uid = ? AND f.sender = ? AND
-       (back >= ? OR (tick >= tick() -  24 AND name = 'Main'))
-GROUP BY f.id, x,y,z, mission, tick,back,f.amount,f.target
-ORDER BY x,y,z,mission,tick
-               });
-
-       my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships
-               WHERe id = ? ORDER BY num
-               });
-
-       $query->execute($c->user->id,$c->user->planet,$c->stash->{TICK});
-       my @fleets;
-       while (my $fleet = $query->fetchrow_hashref){
-               my @ships;
-               $ships->execute($fleet->{id});
-               while (my $ship = $ships->fetchrow_hashref){
-                       push @ships,$ship;
-               }
-               $fleet->{ships} = \@ships;
-               push @fleets,$fleet;
-       }
-       $c->stash(fleets => \@fleets);
+       $c->stash(fleets => member_fleets($dbh, $c->user->id,$c->user->planet));
 
        my $announcements = $dbh->prepare(q{SELECT ft.ftid, u.username,ft.subject,
                count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,count(fp.fpid) AS posts,
@@ -123,6 +82,12 @@ ORDER BY x,y,z,mission,tick
                });
        $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 {
@@ -135,12 +100,67 @@ 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;
 
-       $dbh->do(q{UPDATE users SET sms = ? WHERE uid = ?
-               },undef, html_escape $c->req->param('sms'), $c->user->id);
+       my $callme = $c->req->param('callme') || 0;
+       $dbh->do(q{
+UPDATE users SET sms = $1, call_if_needed =  $2, sms_note = $3 WHERE uid = $4
+               },undef, html_escape $c->req->param('sms'),$callme
+               ,$c->req->param('smsnote'), $c->user->id);
+
+       $c->res->redirect($c->uri_for(''));
+}
+
+sub postowncoords : 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 (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,$x,$y,$z);
+
+               if ($planet){
+                       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: $x:$y:$z");
+               }
+       }else{
+               $c->flash(error => $c->req->param('planet') . " are not valid coords.");
+       }
 
        $c->res->redirect($c->uri_for(''));
 }
@@ -161,16 +181,19 @@ sub postfleetupdate : Local {
                $dbh->begin_work;
                eval{
                        my $insert = $dbh->prepare(q{INSERT INTO fleets
-                               (uid,sender,name,mission,tick,amount)
-                               VALUES (?,?,'Main','Full fleet',tick(),?) RETURNING id});
-                       my ($id) = $dbh->selectrow_array($insert,undef,$c->user->id
+                               (pid,name,mission,tick,amount)
+                               VALUES (?,'Main','Full fleet',tick(),?) RETURNING fid});
+                       my ($id) = $dbh->selectrow_array($insert,undef
                                ,$c->user->planet,$amount);
                        $insert = $dbh->prepare(q{INSERT INTO fleet_ships
-                               (id,ship,amount) VALUES (?,?,?)});
+                               (fid,ship,amount) VALUES (?,?,?)});
                        for my $s (@ships){
                                unshift @{$s},$id;
                                $insert->execute(@{$s});
                        }
+                       $insert = $dbh->prepare(q{INSERT INTO full_fleets
+                               (fid,uid) VALUES (?,?)});
+                       $insert->execute($id,$c->user->id);
                        $dbh->commit;
                };
                if ($@){
@@ -197,9 +220,9 @@ sub postfleetsupdates : Local {
                });
        $dbh->begin_work;
        if ($c->req->param('cmd') eq 'Recall Fleets'){
-               my $updatefleets = $dbh->prepare(q{UPDATE fleets
-                       SET back = tick() + (tick() - (tick - eta))
-                       WHERE uid = ? AND id = ? AND back > tick()+eta
+               my $updatefleets = $dbh->prepare(q{UPDATE launch_confirmations
+                       SET back = tick() + (tick() - (landing_tick - eta))
+                       WHERE uid = ? AND fid = ? AND back >= tick()+eta
                });
 
                for my $param ($c->req->param()){
@@ -209,8 +232,8 @@ sub postfleetsupdates : Local {
                        }
                }
        }elsif ($c->req->param('cmd') eq 'Change Fleets'){
-               my $updatefleets = $dbh->prepare(q{UPDATE fleets
-                       SET back = ? WHERE uid = ? AND id = ?});
+               my $updatefleets = $dbh->prepare(q{UPDATE launch_confirmations
+                       SET back = ? WHERE uid = ? AND fid = ?});
 
                for my $param ($c->req->param()){
                        if ($param =~ /^change:(\d+)$/){
@@ -225,12 +248,39 @@ sub postfleetsupdates : Local {
        $c->res->redirect($c->uri_for(''));
 }
 
+sub ircrequest : Local {
+       my ( $self, $c ) = @_;
+       my $dbh = $c->model;
+
+       $c->stash(reply => $c->flash->{reply});
+       $c->stash(channels => ['scan','members','def']);
+}
+
+sub postircrequest : Local {
+       my ( $self, $c ) = @_;
+       my $dbh = $c->model;
+
+       if ($c->req->param('channel')){
+               my $query = $dbh->prepare(q{
+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', 'ndbot.pl';
+
+               $c->flash(reply => "Msg sent to: ".$c->req->param('channel'));
+               $c->res->redirect($c->uri_for('ircrequest'));
+       }else{
+               $c->stash(ircmessage => $c->req->param('message'));
+               $c->go('ircrequest');
+       }
+}
 
 sub points : Local {
        my ( $self, $c, $order ) = @_;
        my $dbh = $c->model;
 
-       if ($order =~ /^((?:defense|attack|total|humor|scan|raid)_points)$/){
+       if ($order ~~ /^((?:defense|attack|total|humor|scan|raid)_points)$/
+                       || $order ~~ /^(defprio)$/){
                $order = "$1 DESC";
        }else{
                $order = 'total_points DESC';
@@ -239,20 +289,56 @@ sub points : Local {
        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) 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;
+
+       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 {
@@ -280,6 +366,11 @@ sub postintelmessage : 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);
@@ -295,17 +386,17 @@ sub insertintel : Private {
 
        $dbh->begin_work;
        my $findscan = $dbh->prepare(q{SELECT scan_id FROM scans
-               WHERE scan_id = ? AND tick >= tick() - 168 AND groupscan = ?
+               WHERE scan_id = LOWER(?) AND tick >= tick() - 168 AND groupscan = ?
                });
        my $addscan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid,groupscan)
-               VALUES (?,tick(),?,?)
+               VALUES (LOWER(?),tick(),?,?)
                });
        my $addpoint = $dbh->prepare(q{UPDATE users SET scan_points = scan_points + 1
                WHERE uid = ?
                });
        my @scans;
        my $intel = $c->req->param('message');
-       while ($intel =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\d+)}g){
+       while ($intel =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\w+)}g){
                my $groupscan = (defined $1 && $1 eq '_grp') || 0;
                my %scan;
                $scan{id} = $2;
@@ -325,7 +416,7 @@ sub insertintel : Private {
        unless ($tick =~ /^(\d+)$/){
                $tick = $c->stash->{game}->{tick};
        }
-       my $addintel = $dbh->prepare(q{INSERT INTO fleets 
+       my $addintel = $dbh->prepare(q{INSERT INTO intel
                (name,mission,tick,target,sender,eta,amount,ingal,back,uid)
                VALUES($1,$2,$3,planetid($4,$5,$6,$10),planetid($7,$8,$9,$10)
                        ,$11,$12,$13,$14,$15)
@@ -354,6 +445,7 @@ sub insertintel : Private {
 sub launchConfirmation : Local {
        my ( $self, $c ) = @_;
 
+       $c->stash(error => $c->flash->{error});
        $c->stash(missions => $c->flash->{missions});
 }
 
@@ -368,12 +460,12 @@ sub postconfirmation : Local {
                        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 = ?
+                       WHERE c.uid = ? AND r.tick+c.wave-1 = ? AND t.pid = ?
                                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 $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 (?,?)
@@ -385,11 +477,14 @@ sub postconfirmation : Local {
                        WHERE uid = ? AND target = ? AND wave = ?
                        });
                my $addfleet = $dbh->prepare(q{INSERT INTO fleets
-                       (uid,name,mission,sender,target,tick,eta,back,amount)
-                       VALUES ($1,$2,$3,(SELECT planet FROM users WHERE uid = $1),$4,$5,$6,$7,$8)
-                       RETURNING id
+                       (name,mission,pid,tick,amount)
+                       VALUES ($2,$3,(SELECT pid FROM users WHERE uid = $1),tick(),$4)
+                       RETURNING fid
                        });
-               my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (id,ship,amount)
+               my $addconfirmation = $dbh->prepare(q{INSERT INTO launch_confirmations
+                       (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(
@@ -397,7 +492,7 @@ sub postconfirmation : Local {
                        });
                my @missions;
                $dbh->begin_work;
-               while ($missions =~ m/([^\n]+)\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)
+               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)
                        (.*?)
@@ -410,17 +505,14 @@ sub postconfirmation : Local {
                        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;
-                       if ($13){
-                               $tick = $13;
-                       }elsif ($14){
-                               $back += $14;
-                       }
                        $mission{tick} = $tick;
                        $mission{mission} = $mission;
                        $mission{target} = "$x:$y:$z";
@@ -450,8 +542,9 @@ sub postconfirmation : Local {
                                warn "No ships in: $ships";
                                next;
                        }
-                       my $fleet = $dbh->selectrow_array($addfleet,undef,$c->user->id,$name,$mission
-                               ,$planet_id,$tick,$eta,$back,$amount);
+                       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});
@@ -471,7 +564,7 @@ sub postconfirmation : Local {
                                }
                        }elsif ($mission eq 'Defend'){
                                my $call = $findtarget->fetchrow_hashref;
-                               $informDefChannel->execute($fleet,$call->{id});
+                               $informDefChannel->execute($fleet,$call->{call});
                        }
 
                        $log->execute($c->user->id,"Pasted confirmation for $mission mission to $x:$y:$z, landing tick $tick");
@@ -482,12 +575,92 @@ sub postconfirmation : Local {
        };
        if ($@){
                $dbh->rollback;
-               die $@;
+               if ($@ =~ m/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 => $@);
+               }
        }
 
        $c->res->redirect($c->uri_for('launchConfirmation'));
 }
 
+sub defenders : Local {
+       my ( $self, $c, $order ) = @_;
+       my $dbh = $c->model;
+
+       my $defenders = $dbh->prepare(q{
+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 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 pid = $1
+               });
+
+       my @members;
+       while (my $member = $defenders->fetchrow_hashref){
+
+               $member->{fleets} = member_fleets($dbh, $member->{uid}, $member->{planet});
+               $available->execute($member->{planet});
+               my $fleet = {fid => $member->{username}, mission => 'Available', name => 'At home'
+                       , ships => $available->fetchall_arrayref({})
+               };
+               push @{$member->{fleets}}, $fleet;
+               push @members,$member;
+       }
+       $c->stash(members => \@members);
+}
+
+sub member_fleets {
+       my ( $dbh, $uid, $planet ) = @_;
+
+       my $query = $dbh->prepare(q{
+(
+       SELECT DISTINCT ON (mission,name) fid,name,tick, NULL AS eta
+               ,amount, NULL AS coords, pid AS target, NULL AS back
+               ,NULL AS recalled, mission
+       FROM fleets f
+       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), 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  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()
+)
+               });
+
+       my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships
+               WHERE fid = ? ORDER BY num
+               });
+
+       $query->execute($uid,$planet);
+       my @fleets;
+       while (my $fleet = $query->fetchrow_hashref){
+               my @ships;
+               $ships->execute($fleet->{fid});
+               while (my $ship = $ships->fetchrow_hashref){
+                       push @ships,$ship;
+               }
+               $fleet->{ships} = \@ships;
+               push @fleets,$fleet;
+       }
+       return \@fleets;
+}
+
 =head1 AUTHOR
 
 Michael Andreen (harv@ruin.nu)