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

diff --git a/Usermgm.pm b/Usermgm.pm
index ee0187e..445a33a 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -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,18 +135,27 @@ 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
+				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->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)
+				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->execute($1);
 		}else{
@@ -177,9 +186,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;