- my $query = $dbh->prepare(intelquery q{
- o.alliance AS oalliance ,coords(o.x,o.y,o.z) AS ocoords, i.sender
- ,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords, i.target
- },q{not ingal
- AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL) AND (i.mission = 'Defend' OR i.mission = 'AllyDef' ))
- OR ( t.alliance_id = o.alliance_id AND i.mission = 'Attack'))
- AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL)
- AND NOT (i.back IS NOT NULL AND i.back = i.tick + 4)
- AND i.tick > (tick() - $1)
+ my $query = $dbh->prepare(q{
+SELECT salliance, scoords, sender, talliance, tcoords, target
+ ,mission, tick AS landingtick, eta, amount, ingal, username
+FROM full_intel
+WHERE NOT ingal AND tick > (tick() - $1)
+ AND ((COALESCE( talliance <> salliance,TRUE) AND (mission = 'Defend' OR mission = 'AllyDef' ))
+ OR ( talliance = salliance AND mission = 'Attack'))
+ORDER BY tick DESC, mission