X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=f8d332a402079b7f4ad76f51b0565832a08b2287;hb=11ade9ddec1878dca71496b5659db13a756ee1ed;hp=7991aae940ed24668119b9a30b9ac43d7c998dbd;hpb=84bf6435f5e45ba548ecc79a986a2746515a0d1d;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 7991aae..f8d332a 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -16,11 +16,11 @@
 #   Free Software Foundation, Inc.,                                       *
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
-package ND::IRC::Usermgm;
+package NDIRC::Usermgm;
 use strict;
 use warnings;
 use ND::DB;
-use ND::IRC::Access;
+use NDIRC::Access;
 require Exporter;
 
 our @ISA = qw/Exporter/;
@@ -28,8 +28,16 @@ our @ISA = qw/Exporter/;
 our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips/;
 
 sub addUser {
-	my ($nick,$pnick) = @_;
-	DB();
+	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";
@@ -50,8 +58,15 @@ sub addUser {
 	}
 }
 sub whois {
-	my ($nick) = @_;
-	DB();
+	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()){
 		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);
@@ -67,12 +82,17 @@ sub whois {
 }
 
 sub flags {
-	my ($nick) = @_;
-	DB();
-	unless ($1){
+	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("msg $ND::target $flags");
-	}elsif (hc()){
+		$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()){
@@ -81,13 +101,19 @@ sub flags {
 		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 HCs are allowed to check that");
 	}
 }
 
 sub flag {
-	my ($flag) = @_;
+	my ($msg, $command) = @_;
+
+	my ($flag);
+	if(defined $msg && $msg =~ /^(\w)$/){
+		$flag = $1;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: .$command flag");
+		return;
+	}
 
 	if (officer()|| ($ND::target eq $ND::scanchan && $flag eq 'S')){
 		my $f = $ND::DBH->prepare(qq{
@@ -105,22 +131,38 @@ WHERE flag = ?;
 }
 
 sub laston {
-	my ($flag,$min) = @_;
+	my ($msg, $command) = @_;
 
+	my ($flag,$min);
+	my $f;
 	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);
+		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->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->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;
+		}
+
 		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");
 	}
@@ -128,12 +170,22 @@ sub laston {
 
 
 sub getShips {
-	my ($ship) = @_;
+	my ($ship,$command) = @_;
 
+	unless (defined $ship){
+		$ND::server->command("notice $ND::nick Usage: .$command ship | % can be used as wildcard, e.g. beet%");
+		return;
+	}
 	if (officer() || dc()){
-		my $f = $ND::DBH->prepare(qq{SELECT username,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 ? 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;
@@ -153,16 +205,21 @@ sub getShips {
 }
 
 sub addPoints {
-	my ($t,$nick,$p) = @_;
-	DB();
+	my ($msg, $t) = @_;
+
+	my ($nick, $points);
+	if(defined $msg && $msg =~ /^(\S+)(?: (-?\d+))?$/){
+		$nick = $1;
+		$points = $2;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: .$t nick [points] | % can be used for wildcards \%arro\% will match barrow, if the number of points isn't specified, then 1 will be assumed.");
+		return;
+	}
 	if (   ($t eq "d" && dc())
 		|| ($t eq "a" && bc())
 		|| ($t eq "h" && officer())
 		|| ($t eq "s" && scanner())){
-		my $points = 1;
-		if ($p){
-			$points = $p;
-		}
+		$points = 1 unless (defined $points);
 		if ($points*$points > 400){
 			$ND::server->command("msg $ND::target Values between -20 and 20 please");
 			return;
@@ -196,9 +253,17 @@ sub addPoints {
 }
 
 sub chattrG {
-	my ($nick, $flags) = @_;
-	DB();
-	if (hc() || ($flags =~ /^(\+|-)?x$/ && $ND::address eq 'Assassin.users.netgamers.org')){
+	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();
@@ -227,8 +292,16 @@ sub chattrG {
 }
 
 sub setHost {
-	my ($nick, $host) = @_;
-	DB();
+	my ($msg, $command) = @_;
+
+	my ($nick, $host);
+	if(defined $msg && $msg =~ /^(\S+) (\S+)$/){
+		$nick = $1;
+		$host = $2;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: .sethost nick host | % can be used for wildcards \%arro% will match barrow");
+		return;
+	}
 	if (hc()){
 		my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
 		$f->execute($nick);
@@ -252,16 +325,25 @@ sub setHost {
 }
 
 sub setPNick {
-	my ($nick, $pnick) = @_;
-	DB();
+	my ($msg, $command) = @_;
+
+	my ($nick, $pnick);
+	if(defined $msg && $msg =~ /^(\S+) ([^.\s]+)$/){
+		$nick = $1;
+		$pnick = $2;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: .$command nick pnick | % can be used for wildcards \%arro% will match barrow");
+		return;
+	}
 	if (hc()){
 		my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
 		$f->execute($nick);
 		my ($uid,$nick) = $f->fetchrow();
 		if ($f->rows == 1){
 			my ($username,$p_nick) = $ND::DBH->selectrow_array("SELECT username, pnick FROM users WHERE pnick ILIKE ? AND NOT (username ILIKE ?)",undef,$pnick,$nick);
-			if ((not defined $username) && $ND::DBH->do("UPDATE users SET pnick = ? WHERE uid = ?",undef,$pnick,$uid) > 0){
-				$ND::server->command("msg $ND::target Updated $ND::B$nick${ND::B}'s pnick to: $ND::B$pnick$ND::B");
+			my $hostname = "$pnick.users.netgamers.org";
+			if ((not defined $username) && $ND::DBH->do("UPDATE users SET pnick = ?, hostmask = ? WHERE uid = ?",undef,$pnick,$hostname,$uid) > 0){
+				$ND::server->command("msg $ND::target Updated $ND::B$nick${ND::B}'s pnick to: $ND::B$pnick$ND::B and hostname to $ND::B$hostname$ND::B");
 			}elsif(defined $username){
 				$ND::server->command("msg $ND::target $ND::B$username$ND::B already exists with pnick $ND::B$p_nick$ND::B.");
 			}else{
@@ -277,8 +359,15 @@ sub setPNick {
 }
 
 sub deactivateUser {
-	my ($nick) = @_;
-	DB();
+	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);