Escape shiptypes

[NDIRC.git] / Usermgm.pm

diff --git a/Usermgm.pm b/Usermgm.pm
index 83c27ca0681bd19111f68c305a887b0921ce313f..445a33a9eae1923895ff874507f3ab031a1acc96 100644 (file)
--- 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 
@@ -134,28 +134,44 @@ sub laston {
        my ($msg, $command) = @_;
 
        my ($flag,$min);
-       if(defined $msg && $msg =~ /^(\w)(?: (\d+))?$/){
-               $flag = $1;
-               $min = $2;
-       }else{
-               $ND::server->command("notice $ND::nick syntax: .$command flag [days] | lists users and the number of days since they were last seen. If days is specified it will only list users with at least that amount of idle time.");
-               return;
-       }
+       my $f;
+       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() - (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() - (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{
+                       $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.");
+                       return;
+               }
 
-       if (officer()){
-               my $f = $ND::DBH->prepare(qq{SELECT username,last
-                       FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,laston FROM users) u NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag = ? AND (last >= ? OR last IS NULL) ORDER BY laston
-                       });
-               $min = 0 unless defined $min;
-               $f->execute($flag,$min);
                my $text;
                my $i = 0;
                while (my $user = $f->fetchrow_hashref){
                        $user->{last} = '?' unless defined $user->{last};
-                       $text .= "$user->{username}($user->{last}) ";
+                       $user->{lastforum} = '?' unless defined $user->{lastforum};
+                       $text .= "$user->{username}($user->{last}|$user->{lastforum}) ";
                        $i++;
                }
-               $ND::server->command("msg $ND::target $ND::B$i$ND::B Users(days) with flag $ND::B$flag$ND::B: $text");
+               $ND::server->command("msg $ND::target $ND::B$i$ND::B Users(days)".(defined $flag ?  " with flag $ND::B$flag$ND::B" : "").": $text");
        }else{
                $ND::server->command("msg $ND::target Only officers are allowed to check that");
        }
@@ -170,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;