X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=6771d65cf4dbd00a20912cfdaf5283b76f03f743;hb=c8e65de85f3c2724a5290e0ee612b83e7f63aea0;hp=a37dc70af0922c928171823b985d32e3289bf2ff;hpb=f25cb4f16b281bf4b5fff8f711155c7297c7eba4;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index a37dc70..6771d65 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -25,7 +25,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips/;
+our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips getFleet/;
 
 sub addUser {
 	my ($msg, $command) = @_;
@@ -133,25 +133,31 @@ WHERE flag = ?;
 sub laston {
 	my ($msg, $command) = @_;
 
-	my ($flag,$min);
-	my $f;
 	if (officer() || ia()){
-		if(defined $msg && $msg =~ /^(\w)(?: (\d+))?$/){
+		my ($flag,$min);
+		my $f;
+		if(defined $msg && $msg =~ /^(\w)(?: (\d+)(?:\|(\d+)\|(\d+))?)?$/){
 			$flag = $1;
 			$min = $2;
+			my $forum = $3;
+			my $claim = $4;
 			$min = 0 unless defined $min;
-			$f = $ND::DBH->prepare(q{SELECT username
-				,date_part('day',now() - laston)::int AS last
-				,COALESCE(date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid))::text,'?')
-					AS lastforum
-				,COALESCE(date_part('day',now() - (SELECT max(timestamp) FROM raid_claims WHERE uid = u.uid))::text,'?') AS lastclaim
-				FROM users u
-					NATURAL JOIN groupmembers
-					NATURAL JOIN groups
-				WHERE flag = $1 AND COALESCE(date_part('day',now() - laston) >= $2,TRUE)
-				ORDER BY laston
+			$f = $ND::DBH->prepare(q{SELECT username, last
+				,COALESCE(lastforum::text,'?') AS lastforum
+				,COALESCE(lastclaim::text,'?') AS lastclaim
+				FROM (SELECT username
+					,date_part('day',now() - laston)::int AS last
+					,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid)) AS lastforum
+					,date_part('day',now() - (SELECT max(timestamp) FROM raid_claims WHERE uid = u.uid)) AS lastclaim
+					FROM users u
+						NATURAL JOIN groupmembers
+						NATURAL JOIN groups
+					WHERE flag = $1
+				) a
+				WHERE COALESCE(last >= $2,TRUE) AND COALESCE(lastforum >= $3,TRUE) AND COALESCE(lastclaim >= $4,TRUE)
+				ORDER BY last DESC, lastforum DESC, lastclaim DESC
 				});
-			$f->execute($flag,$min);
+			$f->execute($flag,$min,$forum,$claim);
 		}elsif(defined $msg && $msg =~ /^(\S+)$/){
 			$f = $ND::DBH->prepare(q{SELECT username
 				,date_part('day',now() - laston)::int AS last
@@ -191,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;
@@ -216,6 +230,44 @@ sub getShips {
 	}
 }
 
+sub getFleet {
+	my ($nick,$command) = @_;
+
+	unless (defined $nick){
+		$ND::server->command("notice $ND::nick Usage: $command nick | % can be used as wildcard, e.g. barr%");
+		return;
+	}
+	if (officer() || dc()){
+		my $f = $ND::DBH->prepare(q{SELECT fs.ship, fs.amount, username
+			FROM fleet_ships fs
+				JOIN (SELECT fid,username
+					FROM fleets f
+						JOIN users u USING (planet)
+					WHERE mission = 'Full fleet' AND name <> 'Unit'
+						AND username ILIKE $1
+					ORDER BY planet,tick DESC,fid DESC
+					LIMIT 1
+				) f  USING (fid)
+			ORDER BY num
+		});
+		$f->execute($nick);
+		my $text;
+		my $username;
+		while (my $ship = $f->fetchrow_hashref){
+			unless (defined $username) {
+				$username = $ship->{username};
+				$text = "$ND::B$username$ND::O has: "
+			}
+			$text .= "$ship->{ship} $ship->{amount} ";
+		}
+		if ($text){
+			$ND::server->command("notice $ND::nick $text");
+		}else{
+			$ND::server->command("notice $ND::nick Couldn't find any fleet for $nick");
+		}
+	}
+}
+
 sub addPoints {
 	my ($msg, $t) = @_;
 
@@ -231,7 +283,7 @@ sub addPoints {
 		|| ($t eq "a" && bc())
 		|| ($t eq "h" && officer())
 		|| ($t eq "s" && scanner())){
-		$points = 1 unless (defined $points);
+		$points = 1 unless $points;
 		if ($points*$points > 400){
 			$ND::server->command("msg $ND::target Values between -20 and 20 please");
 			return;