Request scans and list requests

[NDIRC.git] / Usermgm.pm

diff --git a/Usermgm.pm b/Usermgm.pm
index f8d332a402079b7f4ad76f51b0565832a08b2287..a37dc70af0922c928171823b985d32e3289bf2ff 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 
@@ -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");
@@ -208,7 +220,7 @@ 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{