X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=b88574505f2f2e677794889564e97c268fbc7c3b;hb=d13d06b986bc3ae067882f23b6ab8b35cf1a8262;hp=2f89142da1e7082ec467fb2fcf63661e03850454;hpb=d6b15c14f164e7150ffcaed86e8aa79795b2d89a;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index 2f89142..b885745 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; @@ -140,7 +163,7 @@ sub postowncoords : Local { $c->flash(error => $c->req->param('planet') . " are not valid coords."); } - $c->res->redirect($c->uri_for('')); + $c->res->redirect($c->uri_for('/'.$c->session->{referrer})); } sub postfleetsupdates : Local { @@ -330,7 +353,7 @@ sub insertintel : Private { }); my @scans; my $intel = $c->req->param('message'); - while ($intel =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\w+)}g){ + while ($intel =~ m{https?://[\w.]+/.+?scan(_id|_grp)?=(\w+)}g){ my $groupscan = (defined $1 && $1 eq '_grp') || 0; my %scan; $scan{id} = $2; @@ -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 'No user with these coords' 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 'Duplicate' 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} = 'Added'; } catch { @@ -492,7 +517,7 @@ WHERE uid = $1 AND num = $2 AND back > tick() }else{ $m->{pid} = $c->user->planet; } - }elsif ($m->{target} =~ /^(\d+):(\d+):(\d+)$/) { + }elsif ($m->{target} ~~ /^(\d+):(\d+):(\d+)$/) { $m->{pid} = $dbh->selectrow_array($findplanet,undef,$1,$2,$3); unless ($m->{pid}){ $m->{warning} = "No planet at $m->{target}, try again next tick."; @@ -560,17 +585,17 @@ sub parseconfirmations { $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+ + Arrival:\s*(\d+)/sx; + my $missionetare = qr/\s* (\d+ \+ \s*)? (\d+) \s+ + Arrival:\s*(\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; + my $missre = qr/((?:Alliance\ Standby)|(?:(?:Fake\ )?\w+))\s*/x; if ($missions =~ m/ - 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+ + Ships \s+ Cla \s+ T\s?1 \s+ T\s?2 \s+ T\s?3 \s+ ETA \s+ Base \s+ \(i\) \s (?.+?) \s+ \(i\) \s+ (?.+?) \s+ \(i\) \s+ (?.+?) \s+ \(i\) \s+ TOTAL \s+ (?.+?) \QTotal Ships in Fleet\E \s+ (\d+) \s+ (?\d+) \s+ (?\d+) \s+ (?\d+) \s+ Mission: \s* (?(?:$missre)*) \s* @@ -582,7 +607,7 @@ sub parseconfirmations { my @targets = split /\s+/, $+{targets}; my @lts = split /\s+/, $+{lts}; my @etas; - my $_ = $+{etas}; + local $_ = $+{etas}; while(/$etare/sxg){ push @etas, $1; } @@ -604,10 +629,16 @@ sub parseconfirmations { next; } + if ($missions[0] eq 'Alliance Standby'){ + shift @missions; + push @slots,\%mission; + next; + } + given(shift @etas){ when(/$missionetare/sx){ $mission{tick} = $3; - $mission{eta} = $1 + $+{eta}; + $mission{eta} = $2 + $+{eta}; $mission{back} = $3 + $mission{eta} - 1; $mission{target} = shift @targets; $mission{lt} = shift @lts; @@ -620,7 +651,7 @@ sub parseconfirmations { $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'; + die "Did you forget some at the end? '$mission{mission}'" if $mission{mission} ne 'Return'; } } push @slots,\%mission; @@ -633,7 +664,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+((?:\d+\s*){5})/g){ my $ship = $1; my @amounts = split /\D+/, $3; my $base = shift @amounts;