Revert "Remove attack groups"

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

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index a8a34b5661f44df010913be92a2415e574464b6b..b8cdbe159d313858d6d1bf89a4dad5f8c883e139 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -83,6 +83,12 @@ ORDER BY landing_tick DESC
                });
        $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 {
@@ -95,6 +101,23 @@ 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;
@@ -605,7 +628,6 @@ sub parseconfirmations {
                        }
 
                        given(shift @etas){
-                               $mission{name} .= " $_";
                                when(/$missionetare/sx){
                                        $mission{tick} = $3;
                                        $mission{eta} = $1 + $+{eta};
@@ -656,7 +678,7 @@ sub findDuplicateFleet : Private {
 SELECT fid FROM fleets f
        LEFT JOIN launch_confirmations lc USING (fid)
 WHERE f.pid = (SELECT pid FROM users WHERE uid = $1)
-       AND mission = $3 AND amount = $4 AND tick > $6 - 6
+       AND mission = $3 AND amount = $4 AND (mission <> 'Full fleet' OR tick > $6 - 6)
        AND COALESCE(uid = $1 AND num = $2 AND lc.pid = $5 AND landing_tick = $6, TRUE)
                });
        my $fid = $dbh->selectrow_array($findfleet,undef,$c->user->id,$m->{num}