X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=493c05c445bfb4a82b9ae244d3204c7173bc8764;hb=b7392dc113b14a269fe73871c57795e18fe7e271;hp=445a33a9eae1923895ff874507f3ab031a1acc96;hpb=a3c33971c0600755b8edaa7d1a675a25b89a3126;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 445a33a..493c05c 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -25,84 +25,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips/;
-
-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) = @_;
-
-	my ($nick);
-	if(defined $msg && $msg =~ /^(\S+)$/){
-		$nick = $1;
-	}else{
-		$ND::server->command("notice $ND::nick syntax: .$command nick | % can be used for wildcards \%arro% will match barrow");
-		return;
-	}
-	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()){
-			$ND::server->command("msg $ND::target $row[0] flags: ($row[2]) host: $row[1]");
-		}
-		if ($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 Only officers are allowed to check that");
-	}
-}
-
-sub flags {
-	my ($msg, $command) = @_;
-
-	my ($nick);
-	if(defined $msg && $msg =~ /^(\S+)$/){
-		$nick = $1;
-	}else{
-		my ($flags) = $ND::DBH->selectrow_array("SELECT TRIM(', ' FROM concat(flag||':'||groupname||', ')) FROM groups");
-		$ND::server->command("notice $ND::nick syntax: .$command nick | % can be used for wildcards \%arro% will match barrow | Current flags: $flags");
-		return;
-	}
-	if (hc()){
-		my $f = $ND::DBH->prepare("SELECT username, concat(flag), TRIM(', ' FROM concat(groupname||', ')) FROM users u LEFT OUTER JOIN (SELECT uid,flag,groupname 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()){
-			$ND::server->command("msg $ND::target Flags for $row[0] on: $ND::target: $row[1]| (Global: $row[2])");
-		}
-		if ($f->rows == 0){
-			$ND::server->command("msg $ND::target No hit, maybe spelling mistake, or add % as wildcard");
-		}
-	}
-}
+our @EXPORT = qw/flag laston addPoints setHost setPNick getShips getFleet/;
 
 sub flag {
 	my ($msg, $command) = @_;
@@ -133,33 +56,43 @@ 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(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 = $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(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 = $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;
 		}
 
@@ -167,8 +100,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");
@@ -188,13 +120,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;
@@ -213,11 +153,49 @@ sub getShips {
 	}
 }
 
+sub getFleet {
+	my ($nick,$command) = @_;
+
+	unless (defined $nick){
+		$ND::server->command("notice $ND::nick Usage: $command nick | % can be used as wildcard, e.g. barr%");
+		return;
+	}
+	if (officer() || dc()){
+		my $f = $ND::DBH->prepare(q{SELECT fs.ship, fs.amount, username
+			FROM fleet_ships fs
+				JOIN (SELECT fid,username
+					FROM fleets f
+						JOIN users u USING (planet)
+					WHERE mission = 'Full fleet' AND name <> 'Unit'
+						AND username ILIKE $1
+					ORDER BY planet,tick DESC,fid DESC
+					LIMIT 1
+				) f  USING (fid)
+			ORDER BY num
+		});
+		$f->execute($nick);
+		my $text;
+		my $username;
+		while (my $ship = $f->fetchrow_hashref){
+			unless (defined $username) {
+				$username = $ship->{username};
+				$text = "$ND::B$username$ND::O has: "
+			}
+			$text .= "$ship->{ship} $ship->{amount} ";
+		}
+		if ($text){
+			$ND::server->command("notice $ND::nick $text");
+		}else{
+			$ND::server->command("notice $ND::nick Couldn't find any fleet for $nick");
+		}
+	}
+}
+
 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{
@@ -228,7 +206,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;
@@ -261,45 +239,6 @@ sub addPoints {
 	}
 }
 
-sub chattrG {
-	my ($msg, $command) = @_;
-
-	my ($nick, $flags);
-	if(defined $msg && $msg =~ /^(\S+) ((\+|-)?\w+)$/){
-		$nick = $1;
-		$flags = $2;
-	}else{
-		$ND::server->command("notice $ND::nick syntax: .chattr nick [-]flags | % can be used for wildcards \%arro% will match barrow, if a - is given then flags will be removed, otherwise added");
-		return;
-	}
-	if (hc()){# || ($flags =~ /^(\+|-)?x$/ && $ND::address eq 'Assassin.users.netgamers.org')){
-		my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
-		$f->execute($nick);
-		my @user = $f->fetchrow();
-		if ($f->rows == 1){
-			my $add = 1;
-			$flags =~ /^(-)/;
-			my $update;
-			if ($1 eq "-"){
-				$update = $ND::DBH->prepare("DELETE FROM groupmembers WHERE uid = ? AND gid = (SELECT gid FROM groups WHERE flag = ?)");
-			}else{
-				$update = $ND::DBH->prepare("INSERT INTO groupmembers (uid,gid) VALUES(?,(SELECT gid FROM groups WHERE flag = ?))");
-			}
-			while ($flags =~ m/(\w)/g){ 
-				$update->execute($user[0],$1);
-			}
-			$update = $ND::DBH->prepare("SELECT concat(flag) FROM (SELECT uid,flag FROM groupmembers NATURAL JOIN groups ORDER BY uid,flag ) g WHERE uid = ? ");
-			my @flags = $ND::DBH->selectrow_array($update,undef,$user[0]);
-			$ND::server->command("msg $ND::target Global flags for $user[1] are now: $flags[0]");
-		}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;
-	}
-}
-
 sub setHost {
 	my ($msg, $command) = @_;
 
@@ -367,35 +306,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;