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

diff --git a/Usermgm.pm b/Usermgm.pm
index c579a3c..e82bcd4 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -25,38 +25,8 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips getFleet/;
+our @EXPORT = qw/whois flags flag laston addPoints chattrG setHost setPNick getShips getFleet/;
 
-sub addUser {
-	my ($msg, $command) = @_;
-
-	my ($nick,$pnick);
-	if(defined $msg && $msg =~ /^(\w+)(?: ([^.\s]+))?$/){
-		$nick = $1;
-		$pnick = $2;
-	}else{
-		$ND::server->command("notice $ND::nick syntax: .$command nick [pnick] | nick must be alphanum characters, if no pnick is given then it will be set to nick");
-		return;
-	}
-	if (hc()){
-		$pnick = $nick unless $pnick;
-		my $host = "$pnick.users.netgamers.org";
-		my ($username,$hostname,$p_nick) = $ND::DBH->selectrow_array(q{SELECT username, hostmask,pnick
-			FROM users WHERE username ILIKE ? OR hostmask ILIKE ? OR pnick ILIKE ?}
-			,undef,$nick,$host,$pnick);
-		if ((not defined $username) && $ND::DBH->do("INSERT INTO users (username,hostmask,pnick,password) VALUES(?,?,?,'')"
-				,undef,$nick,$host,$pnick)){
-			$ND::server->command("msg $ND::target Added $ND::B$nick(/$pnick)$ND::B with host: $ND::B$host$ND::B");
-		}elsif(defined $username){
-			$ND::server->command("msg $ND::target $ND::B$username ($p_nick)$ND::B already exists with host: $ND::B$hostname$ND::B.");
-
-		}else{
-			$ND::server->command("msg $ND::target Something went wrong when trying to add $ND::B$nick ($pnick)$ND::B with host: $ND::B$host$ND::B, ".$ND::DBH->errstr);
-		}
-	}else{
-		$ND::server->command("msg $ND::target Only HCs are allowed to add users");
-	}
-}
 sub whois {
 	my ($msg, $command) = @_;
 
@@ -133,25 +103,31 @@ WHERE flag = ?;
 sub laston {
 	my ($msg, $command) = @_;
 
-	my ($flag,$min);
-	my $f;
 	if (officer() || ia()){
-		if(defined $msg && $msg =~ /^(\w)(?: (\d+))?$/){
+		my ($flag,$min);
+		my $f;
+		if(defined $msg && $msg =~ /^(\w)(?: (\d+)(?:\|(\d+)\|(\d+))?)?$/){
 			$flag = $1;
 			$min = $2;
+			my $forum = $3;
+			my $claim = $4;
 			$min = 0 unless defined $min;
-			$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 = $ND::DBH->prepare(q{SELECT username, last
+				,COALESCE(lastforum::text,'?') AS lastforum
+				,COALESCE(lastclaim::text,'?') AS lastclaim
+				FROM (SELECT username
+					,date_part('day',now() - laston)::int AS last
+					,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid)) AS lastforum
+					,date_part('day',now() - (SELECT max(timestamp) FROM raid_claims WHERE uid = u.uid)) AS lastclaim
+					FROM users u
+						NATURAL JOIN groupmembers
+						NATURAL JOIN groups
+					WHERE flag = $1
+				) a
+				WHERE COALESCE(last >= $2,TRUE) AND COALESCE(lastforum >= $3,TRUE) AND COALESCE(lastclaim >= $4,TRUE)
+				ORDER BY last DESC, lastforum DESC, lastclaim DESC
 				});
-			$f->execute($flag,$min);
+			$f->execute($flag,$min,$forum,$claim);
 		}elsif(defined $msg && $msg =~ /^(\S+)$/){
 			$f = $ND::DBH->prepare(q{SELECT username
 				,date_part('day',now() - laston)::int AS last
@@ -191,13 +167,21 @@ sub getShips {
 	if (officer() || dc()){
 		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
+				JOIN (SELECT DISTINCT ON (planet) planet,fid 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 ?
+					ORDER BY planet,tick DESC,fid DESC) f  USING (planet) 
+				JOIN fleet_ships fs USING (fid)
+			WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
 			GROUP BY username ORDER BY amount DESC
-		});
+			});
+		if ($command eq 'shipshome'){
+			$f = $ND::DBH->prepare(q{
+SELECT username,SUM(amount) AS amount
+FROM available_ships
+WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
+GROUP BY username ORDER BY amount DESC
+			});
+		}
 		$f->execute($ship);
 		my $text;
 		my $i = 0;
@@ -226,14 +210,14 @@ sub getFleet {
 	if (officer() || dc()){
 		my $f = $ND::DBH->prepare(q{SELECT fs.ship, fs.amount, username
 			FROM fleet_ships fs
-				JOIN (SELECT id,username
+				JOIN (SELECT fid,username
 					FROM fleets f
-						JOIN users u ON u.planet = f.sender
+						JOIN users u USING (planet)
 					WHERE mission = 'Full fleet' AND name <> 'Unit'
 						AND username ILIKE $1
-					ORDER BY planet,tick DESC,id DESC
+					ORDER BY planet,tick DESC,fid DESC
 					LIMIT 1
-				) f  USING (id)
+				) f  USING (fid)
 			ORDER BY num
 		});
 		$f->execute($nick);
@@ -269,7 +253,7 @@ sub addPoints {
 		|| ($t eq "a" && bc())
 		|| ($t eq "h" && officer())
 		|| ($t eq "s" && scanner())){
-		$points = 1 unless (defined $points);
+		$points = 1 unless $points;
 		if ($points*$points > 400){
 			$ND::server->command("msg $ND::target Values between -20 and 20 please");
 			return;
@@ -408,35 +392,4 @@ sub setPNick {
 	}
 }
 
-sub deactivateUser {
-	my ($msg, $command) = @_;
-
-	my $nick;
-	if(defined $msg && $msg =~ /^(\S+)$/){
-		$nick = $1;
-	}else{
-		$ND::server->command("notice $ND::nick syntax: .$command user");
-		return;
-	}
-	if (hc()){
-		my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
-		$f->execute($nick);
-		my ($uid,$username) = $f->fetchrow();
-		if ($f->rows == 1){
-			my $updated = $ND::DBH->do("UPDATE users SET hostmask = ?, password = '' WHERE uid = ?",undef,$username,$uid);
-			if ($updated > 0){
-				my $groups = $ND::DBH->do("DELETE FROM groupmembers WHERE uid = ?",undef,$uid);
-				$ND::server->command("msg $ND::target $ND::B$username$ND::B has been deactivated.");
-			}else{
-				$ND::server->command("msg $ND::target Something went wrong when trying to modify $ND::B$username$ND::B");
-			}
-		}elsif ($f->rows == 0){
-			$ND::server->command("msg $ND::target No hit, maybe spelling mistake, or add % as wildcard");
-		}else{
-			$ND::server->command("msg $ND::target More than 1 user matched, please refine the search");
-		}
-		$f->finish;
-	}
-}
-
 1;