X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=b8cdbe159d313858d6d1bf89a4dad5f8c883e139;hb=31684a2875d8b342c7007faa8f564de2f26dc14e;hp=a7f6fb3020622150664e18463df8c12307150e78;hpb=95cfd7bb5173581eda52b1d920840da10fa3a333;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index a7f6fb3..b8cdbe1 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; @@ -554,54 +577,78 @@ WHERE uid = $1 AND num = $2 AND back > tick() sub parseconfirmations { my ( $missions, $tick ) = @_; return unless $missions; - my @missions; - $missions =~ s/,//g; + my @slots; + $missions =~ s/\s?,\s?//g; + $missions =~ s/\s*([:+])\s*/$1/g; + $missions =~ s/\(\s/(/g; + $missions =~ s/\s\)/)/g; + my $returnetare = qr/(\d+) \s+ + Arrival:(\d+)/sx; + my $missionetare = qr/(\d+) (\s+ \(\+\d+\))? \s+ + Arrival:(\d+) \s+ + \QReturn ETA:\E\s*(?:(?Instant) \s+ Cancel \s+ Order + | (?\d+) \s+ Ticks \s+ Recall \s+ Fleet)/sx; + my $etare = qr/(Galaxy:\d+Universe:\d+(?:Alliance:\d+)? + |$missionetare + |$returnetare)\s*/x; + my $missre = qr/((?:Fake\ )?\w+)\s*/x; if ($missions =~ m/ - Ships \s?\t Cla \s?\t T1 \s?\t T2 \s?\t T3 \s?\t Base\ \(i\) \s (?.+?)\ \(i\) \s?\t (?.+?)\ \(i\) \s?\t (?.+?)\ \(i\) \s?\t TOTAL \W+ + Ships \s+ Cla \s+ T\s?1 \s+ T\s?2 \s+ T\s?3 \s+ Base \s+ \(i\) \s (?.+?) \s+ \(i\) \s+ (?.+?) \s+ \(i\) \s+ (?.+?) \s+ \(i\) \s+ TOTAL \s+ (?.+?) - \QTotal Ships in Fleet\E \s?\t (\d+) \s?\t (?\d+) \s?\t (?\d+) \s?\t (?\d+) \W+ - Mission: \t (?\w*) \t (?\w*) \t (?\w*) \W+ - Target: \t (?((\d+:\d+:\d+)?\t)*) \W+ - \QLaunch Tick:\E \t (?(\d*\t)*) \W+ - ETA: \t? (?([^\t]+\t?)*) + \QTotal Ships in Fleet\E \s+ (\d+) \s+ (?\d+) \s+ (?\d+) \s+ (?\d+) \s+ + Mission: \s* (?(?:$missre)*) \s* + Target: \s* (?((\d+:\d+:\d+)?\s)*) \s* + \QLaunch Tick:\E \s* (?(\d+\s+)*) \s* + ETA: \s* (?(?:$etare)*) /sx){ my %match = %-; - my @etas = split /\t/, $+{etas}; - my @targets = split /\t/, $+{targets}; - my @lts = split /\t/, $+{lts}; + my @targets = split /\s+/, $+{targets}; + my @lts = split /\s+/, $+{lts}; + my @etas; + my $_ = $+{etas}; + while(/$etare/sxg){ + push @etas, $1; + } + my @missions ; + $_ = $+{missions}; + while(/$missre/sxg){ + push @missions, $1; + } for my $i (0..2){ my %mission = ( name => $match{name}->[$i], - mission => $match{mission}->[$i], + mission => '' , amount => $match{amount}->[$i], num => $i, ships => [] ); - if ($mission{amount} == 0){ - push @missions,\%mission; + if ($mission{amount} == 0){ + push @slots,\%mission; next; } - $mission{target} = shift @targets; - $mission{lt} = shift @lts; given(shift @etas){ - when(/^(\d+) (\s+ \(\+\d+\))? \W+ - Arrival:\ (\d+) \W+ - \QReturn ETA: \E(Instant|\d+)/sx){ + when(/$missionetare/sx){ $mission{tick} = $3; - $mission{eta} = $1 + $4; + $mission{eta} = $1 + $+{eta}; $mission{back} = $3 + $mission{eta} - 1; + $mission{target} = shift @targets; + $mission{lt} = shift @lts; + $mission{mission} = shift @missions; } - when(/^(\d+) \W+ - Arrival:\ (\d+)/sx){ + when(/$returnetare/sx){ $mission{tick} = $2; $mission{eta} = $1; $mission{back} = $2; + $mission{target} = shift @targets; + $mission{lt} = shift @lts; + $mission{mission} = shift @missions; + die 'Did you forget some at the end?' if $mission{mission} ne 'Return'; } } - push @missions,\%mission; + push @slots,\%mission; } - push @missions,{ + push @slots,{ name => 'Main', num => 3, mission => 'Full fleet', @@ -609,18 +656,18 @@ sub parseconfirmations { amount => 0, ships => [] }; - while ($match{ships}->[0] =~ m/((?:\w+ )*\w+)\s+(FI|CO|FR|DE|CR|BS)[^\d]+([\d\s]+)/g){ + while ($match{ships}->[0] =~ m/(\w+)\s+(FI|CO|FR|DE|CR|BS)[^\d]+((?:\d+\s*){5})/g){ my $ship = $1; my @amounts = split /\D+/, $3; - my $amount = shift @amounts; - die "Ships don't sum up properly" if $amounts[3] != $amount + $amounts[0] + $amounts[1] + $amounts[2]; + my $base = shift @amounts; + die "Ships don't sum up properly" if $amounts[3] != $base + $amounts[0] + $amounts[1] + $amounts[2]; for my $i (0..3){ - push @{$missions[$i]->{ships}},{ship => $ship, amount => $amounts[$i]} if $amounts[$i] > 0; + push @{$slots[$i]->{ships}},{ship => $ship, amount => $amounts[$i]} if $amounts[$i] > 0; } - $missions[3]->{amount} += $amounts[3]; + $slots[3]->{amount} += $amounts[3]; } } - return @missions; + return @slots; } sub findDuplicateFleet : Private { @@ -631,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}