X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=e8a7d0e70e3d509b23a62787c5a9c85c502e5e20;hb=5aebbd7109de51640f6049631093f004d66583d9;hp=a8a34b5661f44df010913be92a2415e574464b6b;hpb=8fd8a78d262322662183a34712a65d6e6d044c8b;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index a8a34b5..e8a7d0e 100644
--- 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;
@@ -357,13 +380,13 @@ sub insertintel : Private {
 	});
 	my @intel;
 	while ($intel =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)
-		\*?\s+(.+)(?:Ter|Cat|Xan|Zik|Etd)?
-		\s+(\d+)\s+(Attack|Defend)\s+(\d+)/gx){
+		\*?\s+(A|D)\s+(.+?)\s+(?:(?:Ter|Cat|Xan|Zik|Etd)\s+)?(\d+)\s+(\d+)/gx){
 		my $ingal = ($1 == $4 && $2 == $5) || 0;
 		my $lt = $tick + $10;
 		my $back = ($ingal ? $lt + 4 : undef);
+		my $mission = $7 eq 'A' ? 'Attack' : 'Defend';
 		eval {
-			$addintel->execute($7,$9,$lt,$1,$2,$3,$4,$5,$6,$tick,$10,$8
+			$addintel->execute($8,$mission,$lt,$1,$2,$3,$4,$5,$6,$tick,$10,$9
 				,$ingal,$back, $c->user->id);
 			push @intel,"Added $&";
 		};
@@ -407,11 +430,12 @@ INSERT INTO irc_requests (uid,channel,message) VALUES($1,'def',$2)
 		});
 
 	my $msg = $c->req->param('message');
-	while ($msg =~ /expand\s+(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\s+([^:]*\S+)\s+(?:Ter|Cat|Xan|Zik|Etd)\s+([\d,]+)\s+(\d+)/gc
-			|| $msg =~ /(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((?:Ter|Cat|Xan|Zik|Etd)\)\s+([^,]*\S+)\s+([\d,]+)\s+(\d+)\s+\(\d+\)/gc){
+	while ($msg =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\*?\s+A\s+(.+?)\s+(Ter|Cat|Xan|Zik|Etd)\s+(\d+)\s+(\d+)/gc
+			||$msg =~ /expand\s+(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\s+([^:]*\S+)\s+(Ter|Cat|Xan|Zik|Etd)\s+([\d,]+)\s+(\d+)/gc
+			|| $msg =~ /(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((Ter|Cat|Xan|Zik|Etd)\)\s+([^,]*\S+)\s+([\d,]+)\s+(\d+)\s+\(\d+\)/gc){
 
 		my $inc = {message => $&};
-		my $amount = $8;
+		my $amount = $9;
 		{
 			$amount =~ s/,//g;
 		}
@@ -419,14 +443,15 @@ INSERT INTO irc_requests (uid,channel,message) VALUES($1,'def',$2)
 			my $uid = $dbh->selectrow_array($user,undef,$1,$2,$3);
 			die '<i>No user with these coords</i>' unless $uid;
 
-			my $call = $dbh->selectrow_array($call,undef,$uid,$9);
+			my $call = $dbh->selectrow_array($call,undef,$uid,$10);
 			if ($call){
 				my $pid = $dbh->selectrow_hashref($fleet,undef,$4,$5,$6,$amount,$7,$call);
 				die '<i>Duplicate</i>' if $pid;
 
 			}
 
-			$irc->execute($c->user->id, $inc->{message});
+			my $message = "$1:$2:$3 $4:$5:$6 $7 $8 $amount $10";
+			$irc->execute($c->user->id, $message);
 			$inc->{status} = '<b>Added</b>';
 
 		} catch {
@@ -605,7 +630,6 @@ sub parseconfirmations {
 			}
 
 			given(shift @etas){
-				$mission{name} .= " $_";
 				when(/$missionetare/sx){
 					$mission{tick} = $3;
 					$mission{eta} = $1 + $+{eta};
@@ -634,7 +658,7 @@ sub parseconfirmations {
 			amount => 0,
 			ships => []
 		};
-		while ($match{ships}->[0] =~ m/(\w+)\s+(FI|CO|FR|DE|CR|BS)[^\d]+((?:\d+\s*){5})/g){
+		while ($match{ships}->[0] =~ m/(\w[ \w]+?)\s+(FI|CO|FR|DE|CR|BS)[^\d]+((?:\d+\s*){5})/g){
 			my $ship = $1;
 			my @amounts = split /\D+/, $3;
 			my $base = shift @amounts;
@@ -656,7 +680,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}