X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=c4d2e2974038f541854d907d5ef7bae19bcf32a0;hp=6afbb6511d058b02ad5511d087b890515388ea9e;hb=23e133163ef06e0afc2000152df31c966f4929b2;hpb=33b79d2e1036801cd29daf0d7692f066bfb034b5

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 6afbb65..c4d2e29 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -59,14 +59,6 @@ sub index : Path : Args(0) {
 			},undef,$c->user->planet)
 	);
 
-	my $calls = $dbh->prepare(q{
-SELECT * FROM defcalls
-WHERE uid = $1 AND landing_tick >= tick()
-ORDER BY landing_tick DESC
-		});
-	$calls->execute($c->user->id);
-	$c->stash(calls => $calls->fetchall_arrayref({}) );
-
 	$c->stash(fleets => member_fleets($dbh, $c->user->id,$c->user->planet));
 
 	my $announcements = $dbh->prepare(q{SELECT ft.ftid, u.username,ft.subject,
@@ -386,7 +378,7 @@ sub insertintel : Private {
 	});
 	my @intel;
 	while ($intel =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)
-		\*?\s+(A|D)\s+(.+?)\s+(?:(?:Ter|Cat|Xan|Zik|Etd)\s+)?(\d+)\s+(\d+)/gx){
+		\*?\s+(A|D)\s+(.+?)\s+(?:(?:\w+)\s+)?(\d+)\s+(\d+)/gx){
 		my $ingal = ($1 == $4 && $2 == $5) || 0;
 		my $lt = $tick + $10;
 		my $back = ($ingal ? $lt + 4 : undef);
@@ -405,77 +397,6 @@ sub insertintel : Private {
 	$c->flash(scans => \@scans);
 }
 
-sub addincs : Local {
-	my ( $self, $c ) = @_;
-	$c->stash(incs => $c->flash->{incs});
-
-}
-
-sub postincs : Local {
-	my ( $self, $c ) = @_;
-	my $dbh = $c->model;
-
-	my @incs;
-
-	my $user = $dbh->prepare(q{
-SELECT uid FROM users u
-WHERE pid = planetid($1,$2,$3,tick())
-	AND uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
-		});
-	my $call = $dbh->prepare(q{
-SELECT call
-FROM calls WHERE uid = $1 AND landing_tick = tick() + $2
-		});
-	my $fleet = $dbh->prepare(q{
-SELECT pid
-FROM incomings i
-WHERE pid = planetid($1,$2,$3,tick()) AND amount = $4 and fleet = $5 AND call = $6
-		});
-	my $irc = $dbh->prepare(q{
-INSERT INTO irc_requests (uid,channel,message) VALUES($1,'def',$2)
-		});
-
-	my $msg = $c->req->param('message');
-	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 = $9;
-		{
-			$amount =~ s/,//g;
-		}
-		try {
-			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,$10);
-			if ($call){
-				my $pid = $dbh->selectrow_hashref($fleet,undef,$4,$5,$6,$amount,$7,$call);
-				die '<i>Duplicate</i>' if $pid;
-
-			}
-
-			my $message = "$1:$2:$3 $4:$5:$6 $7 $8 $amount $10";
-			$irc->execute($c->user->id, $message);
-			$inc->{status} = '<b>Added</b>';
-
-		} catch {
-			when (m(^(<i>.*</i>) at )){
-				$inc->{status} = $1;
-			}
-			default {
-				$inc->{status} = $_;
-			}
-		};
-		push @incs, $inc;
-	}
-
-	$c->signal_bots if @incs;
-	$c->flash(incs => \@incs);
-	$c->res->redirect($c->uri_for('addincs'));
-}
-
 sub launchConfirmation : Local {
 	my ( $self, $c ) = @_;