X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=c579a3cf336282f87fa0952aefa220daf126fe6b;hb=fe6db7c088929577f239ee7f8ce4615d938432b6;hp=ee0187e0f73779515c20a0f6a114f15747f759ac;hpb=2b795f19f3be1384d5191febd14a9d3f81e0b0e2;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index ee0187e..c579a3c 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) = @_;
@@ -67,7 +67,7 @@ sub whois {
 		$ND::server->command("notice $ND::nick syntax: .$command nick | % can be used for wildcards \%arro% will match barrow");
 		return;
 	}
-	if (officer()){
+	if (officer() || ia()){
 		my $f = $ND::DBH->prepare("SELECT username, hostmask, concat(flag) FROM users u LEFT OUTER JOIN (SELECT uid,flag FROM groupmembers NATURAL JOIN groups ORDER BY uid,flag ) g ON g.uid = u.uid  WHERE username ILIKE ? GROUP BY username,hostmask");
 		$f->execute($nick);
 		while (my @row = $f->fetchrow()){
@@ -115,7 +115,7 @@ sub flag {
 		return;
 	}
 
-	if (officer()|| ($ND::target eq $ND::scanchan && $flag eq 'S')){
+	if (officer() || ia() || ($ND::target eq $ND::scanchan && $flag eq 'S')){
 		my $f = $ND::DBH->prepare(qq{
 SELECT TRIM(', ' FROM concat(username||', ')),count(username) FROM
 	(SELECT uid, username FROM users ORDER BY username) u NATURAL JOIN groupmembers gm 
@@ -135,22 +135,35 @@ sub laston {
 
 	my ($flag,$min);
 	my $f;
-	if (officer()){
+	if (officer() || ia()){
 		if(defined $msg && $msg =~ /^(\w)(?: (\d+))?$/){
 			$flag = $1;
 			$min = $2;
 			$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() - last_forum_visit)::int AS lastforum, laston FROM users) 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
+				,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->execute($flag,$min);
 		}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() - last_forum_visit)::int AS lastforum, laston FROM users) 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;
 		}
 
@@ -158,8 +171,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");
@@ -177,9 +189,15 @@ sub getShips {
 		return;
 	}
 	if (officer() || dc()){
-		my $f = $ND::DBH->prepare(qq{SELECT username,SUM(amount) AS amount
-			FROM users u JOIN fleets f USING (uid) JOIN fleet_ships fs ON f.id = fs.fleet WHERE f.fleet = 0 AND ship ILIKE ? GROUP BY username ORDER BY amount DESC
-			});
+		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
+					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 ?
+			GROUP BY username ORDER BY amount DESC
+		});
 		$f->execute($ship);
 		my $text;
 		my $i = 0;
@@ -198,11 +216,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{