X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=6771d65cf4dbd00a20912cfdaf5283b76f03f743;hb=21cb796be35d56fc6620af557355ab57b6c00e88;hp=1f8545b689c3cf8a4329ba8457a76fa35dae99ba;hpb=47383ede9e30dfc3a233f3e9fa136fecb4ce5ae7;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 1f8545b..6771d65 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -197,13 +197,21 @@ sub getShips {
 	if (officer() || dc()){
 		my $f = $ND::DBH->prepare(qq{SELECT username,SUM(fs.amount) AS amount
 			FROM users u 
-				JOIN (SELECT DISTINCT ON (sender) sender AS planet,id FROM fleets
+				JOIN (SELECT DISTINCT ON (planet) planet,fid FROM fleets
 					WHERE mission = 'Full fleet' AND name <> 'Unit'
-					ORDER BY sender,tick DESC,id DESC) f  USING (planet) 
-				JOIN fleet_ships fs ON f.id = fs.id
-			WHERE ship ILIKE ?
+					ORDER BY planet,tick DESC,fid DESC) f  USING (planet) 
+				JOIN fleet_ships fs USING (fid)
+			WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
 			GROUP BY username ORDER BY amount DESC
-		});
+			});
+		if ($command eq 'shipshome'){
+			$f = $ND::DBH->prepare(q{
+SELECT username,SUM(amount) AS amount
+FROM available_ships
+WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
+GROUP BY username ORDER BY amount DESC
+			});
+		}
 		$f->execute($ship);
 		my $text;
 		my $i = 0;
@@ -232,14 +240,14 @@ sub getFleet {
 	if (officer() || dc()){
 		my $f = $ND::DBH->prepare(q{SELECT fs.ship, fs.amount, username
 			FROM fleet_ships fs
-				JOIN (SELECT id,username
+				JOIN (SELECT fid,username
 					FROM fleets f
-						JOIN users u ON u.planet = f.sender
+						JOIN users u USING (planet)
 					WHERE mission = 'Full fleet' AND name <> 'Unit'
 						AND username ILIKE $1
-					ORDER BY planet,tick DESC,id DESC
+					ORDER BY planet,tick DESC,fid DESC
 					LIMIT 1
-				) f  USING (id)
+				) f  USING (fid)
 			ORDER BY num
 		});
 		$f->execute($nick);