X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=89997ba64b41202ce2f043cc798aa0b118222ce8;hb=68829839b9031bf91844f5d5a3b516792bf1697f;hp=10e8fbddd616fc22475570ab0e4f57578ef17d00;hpb=85d8a494df2ada3f891653a950246046d23a981d;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 10e8fbd..89997ba 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -61,6 +61,7 @@ sub index : Path : Args(0) {
 	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({}) );
@@ -260,7 +261,7 @@ SELECT username,defense_points,attack_points
 	,(attack_points+defense_points+scan_points/20)::NUMERIC(4,0) as total_points
 	, count(NULLIF(rc.launched,FALSE)) AS raid_points
 FROM users_defprio u LEFT OUTER JOIN raid_claims rc USING (uid)
-WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
+WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
 GROUP BY username,defense_points,attack_points,scan_points,humor_points,defprio
 ORDER BY } . "$order $limit"
 	);
@@ -423,8 +424,8 @@ sub postconfirmation : Local {
 			WHERE c.uid = ? AND r.tick+c.wave-1 = ? AND t.pid = ?
 				AND r.open AND not r.removed
 			});
-		my $finddefensetarget = $dbh->prepare(q{SELECT c.id FROM calls c
-				JOIN users u ON c.member = u.uid
+		my $finddefensetarget = $dbh->prepare(q{SELECT call FROM calls c
+				JOIN users u USING (uid)
 			WHERE u.pid = $1 AND c.landing_tick = $2
 		});
 		my $informDefChannel = $dbh->prepare(q{INSERT INTO defense_missions
@@ -524,7 +525,7 @@ sub postconfirmation : Local {
 				}
 			}elsif ($mission eq 'Defend'){
 				my $call = $findtarget->fetchrow_hashref;
-				$informDefChannel->execute($fleet,$call->{id});
+				$informDefChannel->execute($fleet,$call->{call});
 			}
 
 			$log->execute($c->user->id,"Pasted confirmation for $mission mission to $x:$y:$z, landing tick $tick");
@@ -554,13 +555,13 @@ SELECT uid,pid AS planet,username, to_char(NOW() AT TIME ZONE timezone,'HH24:MI'
 	,sms_note, call_if_needed, race, timezone
 FROM users u
 	JOIN current_planet_stats p USING (pid)
-WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
-ORDER BY call_if_needed DESC, LOWER(username)
+WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
+ORDER BY call_if_needed DESC, username
 		});
 	$defenders->execute;
 
 	my $available = $dbh->prepare(q{
-SELECT ship,amount FROM available_ships WHERE planet = $1
+SELECT ship,amount FROM available_ships WHERE pid = $1
 		});
 
 	my @members;