X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=1f8545b689c3cf8a4329ba8457a76fa35dae99ba;hb=ea158d30abf874821b98aa388dd9dcc71b4322dc;hp=445a33a9eae1923895ff874507f3ab031a1acc96;hpb=ccb4338b25220a94114da1bdf5d5d0345c885b06;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 445a33a..1f8545b 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,33 +133,43 @@ 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(qq{SELECT username,last,lastforum
-				FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last
-					,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid))::int AS lastforum
-					,laston FROM users u) u
-					NATURAL JOIN groupmembers
-					NATURAL JOIN groups
-				WHERE flag = ? AND (last >= ? OR last IS NULL)
-				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(qq{SELECT username,last,lastforum
-				FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last
-					,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid))::int AS lastforum
-					, laston FROM users u) u
-				WHERE username ILIKE ? ORDER BY lower(username)
+			$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
+				WHERE username ILIKE $1 ORDER BY lower(username)
 				});
 			$f->execute($1);
 		}else{
-			$ND::server->command("notice $ND::nick syntax: .$command <flag [days]|nick> | lists users and the number of days since they were last seen (irc|forum). If days is specified it will only list users with at least that amount of idle time.");
+			$ND::server->command("notice $ND::nick syntax: .$command <flag [days]|nick> | lists users and the number of days since they were last seen (irc|forum|claim). If days is specified it will only list users with at least that amount of idle time.");
 			return;
 		}
 
@@ -167,8 +177,7 @@ sub laston {
 		my $i = 0;
 		while (my $user = $f->fetchrow_hashref){
 			$user->{last} = '?' unless defined $user->{last};
-			$user->{lastforum} = '?' unless defined $user->{lastforum};
-			$text .= "$user->{username}($user->{last}|$user->{lastforum}) ";
+			$text .= "$user->{username}($user->{last}|$user->{lastforum}|$user->{lastclaim}) ";
 			$i++;
 		}
 		$ND::server->command("msg $ND::target $ND::B$i$ND::B Users(days)".(defined $flag ?  " with flag $ND::B$flag$ND::B" : "").": $text");
@@ -213,11 +222,49 @@ 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 id,username
+					FROM fleets f
+						JOIN users u ON u.planet = f.sender
+					WHERE mission = 'Full fleet' AND name <> 'Unit'
+						AND username ILIKE $1
+					ORDER BY planet,tick DESC,id DESC
+					LIMIT 1
+				) f  USING (id)
+			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) = @_;
 
 	my ($nick, $points);
-	if(defined $msg && $msg =~ /^(\S+)(?: (-?\d+))?$/){
+	if(defined $msg && $msg =~ /^(\S+)(?: (-?(\d+)?(\.\d+)?))?$/){
 		$nick = $1;
 		$points = $2;
 	}else{
@@ -228,7 +275,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;