Don't show ingal launch confirmations as intel

diff --git a/NDWeb/Pages/Alliances.pm b/NDWeb/Pages/Alliances.pm
index 7fc022494796a3ea14da99c1597fbcc5b1998a3a..59106e6262858920223de314a9e93dd14714ce29 100644 (file)
--- a/NDWeb/Pages/Alliances.pm
+++ b/NDWeb/Pages/Alliances.pm
@@ -119,6 +119,7 @@ sub render_body {
                                AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
                                AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL)))
                                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)
                                }));
                $query->execute($alliance->{id}) or warn $DBH->errstr;
 

diff --git a/NDWeb/Pages/Intel.pm b/NDWeb/Pages/Intel.pm
index a5dfc5e77b37cf5d6832c01276fae568ee7cb18a..6e1d17fc8225567345d729ed08326d24f77c9c10 100644 (file)
--- a/NDWeb/Pages/Intel.pm
+++ b/NDWeb/Pages/Intel.pm
@@ -216,7 +216,9 @@ sub render_body {
                                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)
-                               $showticks}));
+                               AND NOT (i.back IS NOT NULL AND i.back = i.tick + 4)
+                               $showticks
+                               }));
                $query->execute() or $error .= $DBH->errstr;
 
                my @intellists;