X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=a37dc70af0922c928171823b985d32e3289bf2ff;hb=dfea4968ee6ecf37dda558340e26261a2e3b97f0;hp=63e3187e1531dad9b7b82d5faba1029d07a3181a;hpb=b1653abca3a499238a4d2f97a3e714a116e334c1;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 63e3187..a37dc70 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -140,17 +140,30 @@ sub laston {
 			$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{