X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FIntel.pm;h=bafea58ea8be45ad64da1f5450990e5b3193ad52;hb=07aec9f5f20e4a605d65bbe2337a05663c0b16e7;hp=bbdf0f749ad461fb16fd0ffaa1101569ddf60105;hpb=c8563070feee1d24bcdab637f37048b68e8b0b4d;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Intel.pm b/lib/NDWeb/Controller/Intel.pm
index bbdf0f7..bafea58 100644
--- a/lib/NDWeb/Controller/Intel.pm
+++ b/lib/NDWeb/Controller/Intel.pm
@@ -31,15 +31,14 @@ sub index :Path : Args(0) {
 	my $ticks = $c->req->param('ticks') || 48;
 	$c->stash(showticks => $ticks);
 
-	my $query = $dbh->prepare(intelquery q{
-			o.alliance AS oalliance ,coords(o.x,o.y,o.z) AS ocoords, i.sender
-			,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords, i.target
-		},q{not ingal
-			AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL) AND (i.mission = 'Defend' OR i.mission = 'AllyDef' ))
-			OR ( t.alliance_id = o.alliance_id AND i.mission = 'Attack'))
-			AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL)
-			AND NOT (i.back IS NOT NULL AND i.back = i.tick + 4)
-			AND i.tick > (tick() - $1)
+	my $query = $dbh->prepare(q{
+SELECT salliance, scoords, sender, talliance, tcoords, target
+	,mission, tick AS landingtick, eta, amount, ingal, username
+FROM full_intel
+WHERE NOT ingal AND tick > (tick() - $1)
+	AND ((COALESCE( talliance <> salliance,TRUE) AND (mission = 'Defend' OR mission = 'AllyDef' ))
+		OR ( talliance = salliance AND mission = 'Attack'))
+ORDER BY tick DESC, mission
 		});
 	$query->execute($ticks);
 	$c->stash(intel => $query->fetchall_arrayref({}) );
@@ -50,7 +49,7 @@ sub index :Path : Args(0) {
 		while ($coords =~ m/(\d+:\d+:\d+)/g){
 			push @coords,$1;
 		}
-		my $planets = $dbh->prepare(q{SELECT id,coords(x,y,z), alliance, nick
+		my $planets = $dbh->prepare(q{SELECT pid AS id,coords(x,y,z), alliance, nick
 			FROM current_planet_stats p
 			WHERE coords(x,y,z) = ANY($1)
 			ORDER BY alliance, p.x, p.y, p.z
@@ -71,8 +70,8 @@ sub planet : Local {
 	my $ticks = $c->req->param('ticks') || 48;
 	$c->stash(showticks => $ticks);
 
-	my $query = $dbh->prepare(q{SELECT id,coords(x,y,z),alliance,nick,channel
-		FROM current_planet_stats WHERE channel ILIKE ?
+	my $query = $dbh->prepare(q{SELECT pid AS id,coords(x,y,z),alliance,nick,channel
+		FROM current_planet_stats WHERE channel = $1
 		ORDER BY alliance,x,y,z
 		});
 	$query->execute($p->{channel});
@@ -84,15 +83,23 @@ sub planet : Local {
 	$c->stash(govs => ["","Feu", "Dic", "Dem","Uni"]);
 	$c->stash(planetstatus => ["","Friendly", "NAP", "Hostile"]);
 
-	$query = $dbh->prepare(intelquery q{i.sender
-			,o.alliance AS oalliance,coords(o.x,o.y,o.z) AS ocoords
-		},q{i.target = $1 AND i.tick > (tick() - $2)});
+	$query = $dbh->prepare(q{
+SELECT salliance, scoords, sender
+	,mission, tick AS landingtick, eta, amount, ingal, username
+FROM full_intel
+WHERE target = $1 AND tick > (tick() - $2)
+ORDER BY tick DESC, mission
+		});
 	$query->execute($id,$ticks);
 	$c->stash(incoming => $query->fetchall_arrayref({}) );
 
-	$query = $dbh->prepare(intelquery q{i.target
-			,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords
-		},q{i.sender = $1 AND i.tick > (tick() - $2)});
+	$query = $dbh->prepare(q{
+SELECT talliance, tcoords, target
+	,mission, tick AS landingtick, eta, amount, ingal, username
+FROM full_intel
+WHERE sender = $1 AND tick > (tick() - $2)
+ORDER BY tick DESC, mission
+		});
 	$query->execute($id,$ticks);
 	$c->stash(outgoing => $query->fetchall_arrayref({}) );
 
@@ -102,16 +109,16 @@ sub channels : Local {
 	my ( $self, $c, $order ) = @_;
 	my $dbh = $c->model;
 
-	if ($order ~~ /(alliance|channel)/){
+	if ($order ~~ /(alliance)/){
 		$order = "lower($1) ASC";
 	}elsif ($order ~~ /(coords)/){
 		$order = "x,y,z";
 	}else{
-		$order = 'lower(channel)';
+		$order = 'channel';
 	}
 
 	my $query = $dbh->prepare(q{
-SELECT id,coords(x,y,z),nick,channel,alliance FROM current_planet_stats
+SELECT pid AS id,coords(x,y,z),nick,channel,alliance FROM current_planet_stats
 WHERE channel <> '' and channel IS NOT NULL
 ORDER BY } . $order
 	);
@@ -142,33 +149,33 @@ sub postplanetupdate : Local {
 		});
 	if ($c->req->param('cnick')){
 		my $value = html_escape $c->req->param('nick');
-		$dbh->do(q{UPDATE planets SET nick = ? WHERE id =?}
+		$dbh->do(q{UPDATE planets SET nick = ? WHERE pid =?}
 			,undef,$value,$p->{id});
 		$log->execute($c->user->id,$p->{ftid},"Set nick to: $value");
 	}
 	if ($c->req->param('cchannel')){
 		my $value = html_escape $c->req->param('channel');
-		$dbh->do(q{UPDATE planets SET channel = ? WHERE id =?}
+		$dbh->do(q{UPDATE planets SET channel = ? WHERE pid =?}
 			,undef,$value,$p->{id});
 		$log->execute($c->user->id,$p->{ftid},"Set channel to: $value");
 	}
 	if ($c->req->param('cstatus')){
 		my $value = $c->req->param('status');
-		$dbh->do(q{UPDATE planets SET planet_status = ? WHERE id =?}
+		$dbh->do(q{UPDATE planets SET planet_status = ? WHERE pid =?}
 			,undef,$value,$p->{id});
 		$log->execute($c->user->id,$p->{ftid},"Set planet_status to: $value");
 	}
 	if ($c->req->param('cgov')){
 		my $value = $c->req->param('gov');
-		$dbh->do(q{UPDATE planets SET gov = ? WHERE id =?}
+		$dbh->do(q{UPDATE planets SET gov = ? WHERE pid =?}
 			,undef,$value,$p->{id});
 		$log->execute($c->user->id,$p->{ftid},"Set gov to: $value");
 	}
 	if ($c->req->param('calliance')){
 		my $value = $c->req->param('alliance');
-		$dbh->do(q{UPDATE planets SET alliance_id = NULLIF(?,-1) WHERE id =?}
+		$dbh->do(q{UPDATE planets SET alliance = NULLIF(?,'') WHERE pid = ?}
 			,undef,$value,$p->{id});
-		$log->execute($c->user->id,$p->{ftid},"Set alliance_id to: $value");
+		$log->execute($c->user->id,$p->{ftid},"Set alliance to: $value");
 	}
 	$dbh->commit;
 
@@ -188,7 +195,7 @@ sub find : Local {
 			,undef,$1,$2,$3,$4);
 		$c->res->redirect($c->uri_for('planet',$planet));
 	}else{
-		my $query = $dbh->prepare(q{SELECT id,coords(x,y,z),nick
+		my $query = $dbh->prepare(q{SELECT pid AS id,coords(x,y,z),nick
 			FROM current_planet_stats p
 			WHERE nick ilike $1
 		});
@@ -206,10 +213,10 @@ sub findPlanet : Private {
 	my ( $self, $c, $id ) = @_;
 	my $dbh = $c->model;
 
-	my $query = $dbh->prepare(q{SELECT x,y,z,id, nick, alliance,alliance_id
+	my $query = $dbh->prepare(q{SELECT x,y,z,pid AS id, nick, alliance,aid
 		, planet_status,channel,ftid,gov
 		FROM current_planet_stats
-		WHERE id = $1
+		WHERE pid = $1
 		});
 	$query->execute($id);
 	$c->stash(p => $query->fetchrow_hashref);
@@ -229,17 +236,17 @@ sub members : Local {
 		,count(CASE WHEN i.mission = 'Attack' THEN 1 ELSE NULL END) AS attacks
 		,count(CASE WHEN (i.mission = 'Defend' OR i.mission = 'AllyDef') THEN 1 ELSE NULL END) AS defenses
 		,count(CASE WHEN i.mission = 'Attack' AND rt.id IS NULL THEN 1 ELSE NULL END) AS solo
-		,count(CASE WHEN i.mission = 'Defend' OR i.mission = 'AllyDef' THEN NULLIF(i.ingal OR (t.alliance_id = 1),TRUE) ELSE NULL END) AS bad_def
+		,count(CASE WHEN i.mission = 'Defend' OR i.mission = 'AllyDef' THEN NULLIF(i.ingal OR (t.alliance = 'NewDawn'),TRUE) ELSE NULL END) AS bad_def
 		FROM users u
 		JOIN groupmembers gm USING (uid)
-		LEFT OUTER JOIN (SELECT DISTINCT ON (planet) planet,tick from scans where type = 'News' ORDER BY planet,tick DESC) n USING (planet)
-		LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
-		LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
-		LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
-				JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
-			AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick 
+		LEFT OUTER JOIN (SELECT DISTINCT ON (pid) pid,tick from scans where type = 'News' ORDER BY pid,tick DESC) n USING (pid)
+		LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.pid
+		LEFT OUTER JOIN current_planet_stats t ON i.target = t.pid
+		LEFT OUTER JOIN (SELECT rt.id,pid,tick FROM raids r
+				JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.pid = i.target
+			AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick
 		LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid AND i.tick = rt.tick + rc.wave - 1
-		WHERE gm.gid = 2
+		WHERE gm.gid = 'M'
 		GROUP BY u.uid,u.username,u.attack_points, u.defense_points,n.tick
 		ORDER BY }. " $order DESC" );
 	$query->execute;
@@ -253,16 +260,16 @@ sub member : Local {
 	my $query = $dbh->prepare(q{
 		SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched, inc.landing_tick
 		FROM users u
-		LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
-		LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
-		LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r 
-				JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target 
-			AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick 
+		LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM intel WHERE amount IS NULL) i ON i.sender = u.pid
+		LEFT OUTER JOIN current_planet_stats t ON i.target = t.pid
+		LEFT OUTER JOIN (SELECT rt.id,pid,tick FROM raids r
+				JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.pid = i.target
+			AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick
 		LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid AND i.tick = rt.tick + rc.wave - 1
-		LEFT OUTER JOIN (SELECT sender, eta, landing_tick FROM calls c 
-					JOIN incomings i ON i.call = c.id) inc ON inc.sender = i.target 
+		LEFT OUTER JOIN (SELECT pid, eta, landing_tick FROM calls c
+					JOIN incomings i USING (call)) inc ON inc.pid = i.target
 				AND (inc.landing_tick + inc.eta) >= i.tick 
-				AND (inc.landing_tick - inc.eta - 1) <= (i.tick - i.eta) 
+				AND (inc.landing_tick - inc.eta - 1) <= (i.tick - i.eta)
 		WHERE u.uid = $1 AND i.mission = 'Attack'
 		ORDER BY (i.tick - i.eta)
 		});
@@ -288,10 +295,10 @@ sub member : Local {
 	$c->stash(attacks => \@attacks);
 
 	$query = $dbh->prepare(q{
-		SELECT coords(t.x,t.y,t.z),t.alliance_id, t.alliance, i.eta, i.tick, i.ingal
+		SELECT coords(t.x,t.y,t.z),t.aid, t.alliance, i.eta, i.tick, i.ingal
 		FROM users u
-		JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.planet
-		LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
+		JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM intel WHERE amount IS NULL) i ON i.sender = u.pid
+		LEFT OUTER JOIN current_planet_stats t ON i.target = t.pid
 		WHERE u.uid = $1 AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
 		ORDER BY (i.tick - i.eta)
 		});
@@ -301,7 +308,7 @@ sub member : Local {
 	my @other_def;
 	while (my $intel = $query->fetchrow_hashref){
 		my $def = {target => $intel->{coords}, other => $intel->{alliance}, tick => $intel->{tick}};
-		if (defined $intel->{alliance_id} && $intel->{alliance_id} == 1){
+		if ($intel->{alliance} ~~ 'NewDawn'){
 			push @nd_def, $def;
 		}elsif($intel->{ingal}){
 			push @ingal_def, $def;
@@ -320,7 +327,7 @@ sub naps : Local {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
 
-	my $query = $dbh->prepare(q{SELECT p.id,coords(x,y,z)
+	my $query = $dbh->prepare(q{SELECT pid AS id,coords(x,y,z)
 		,ruler, p.planet,race, size, score, value
 		, xp, sizerank, scorerank, valuerank, xprank, p.value - p.size*200 
 			- COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150
@@ -329,8 +336,8 @@ sub naps : Local {
 		,(metal+crystal+eonium)/100 AS resvalue, planet_status,hit_us
 		, alliance,relationship,nick
 		FROM current_planet_stats p
-			LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
-			LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet
+			LEFT OUTER JOIN current_planet_scans ps USING (pid)
+			LEFT OUTER JOIN current_development_scans ds USING (pid)
 		WHERE planet_status IN ('Friendly','NAP') order by x,y,z asc
 		});
 	$query->execute;