Need to pick channel before sending

[ndwebbie.git] / lib / NDWeb / Controller / Intel.pm

diff --git a/lib/NDWeb/Controller/Intel.pm b/lib/NDWeb/Controller/Intel.pm
index fd844725a0b407eec6ab3f0c7ef69f0eb49f4168..535ca28bbf0a4d7109796df30001a2750416895e 100644 (file)
--- a/lib/NDWeb/Controller/Intel.pm
+++ b/lib/NDWeb/Controller/Intel.pm
@@ -49,7 +49,7 @@ sub index :Path : Args(0) {
                while ($coords =~ m/(\d+:\d+:\d+)/g){
                        push @coords,$1;
                }
-               my $planets = $dbh->prepare(q{SELECT id,coords(x,y,z), alliance
+               my $planets = $dbh->prepare(q{SELECT id,coords(x,y,z), alliance, nick
                        FROM current_planet_stats p
                        WHERE coords(x,y,z) = ANY($1)
                        ORDER BY alliance, p.x, p.y, p.z
@@ -211,7 +211,7 @@ sub members : Local {
                FROM users u
                JOIN groupmembers gm USING (uid)
                LEFT OUTER JOIN (SELECT DISTINCT ON (planet) planet,tick from scans where type = 'News' ORDER BY planet,tick DESC) n USING (planet)
-               LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+               LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
                LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
                LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
                                JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
@@ -231,7 +231,7 @@ sub member : Local {
        my $query = $dbh->prepare(q{
                SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched, inc.landing_tick
                FROM users u
-               LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+               LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
                LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
                LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
                                JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
@@ -268,7 +268,7 @@ sub member : Local {
        $query = $dbh->prepare(q{
                SELECT coords(t.x,t.y,t.z),t.alliance_id, t.alliance, i.eta, i.tick, i.ingal
                FROM users u
-               JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
+               JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
                LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
                WHERE u.uid = $1 AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
                ORDER BY (i.tick - i.eta)