X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=83c27ca0681bd19111f68c305a887b0921ce313f;hb=a57f94a968f33e287a26fbb8c9e97c11b0966b67;hp=16ef53844296fa1ddcca53938b70a832083a6500;hpb=503db6bf51120be14f2b16643462dfd2a39a9bc0;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 16ef538..83c27ca 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -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,7 +131,16 @@ WHERE flag = ?;
 }
 
 sub laston {
-	my ($flag,$min) = @_;
+	my ($msg, $command) = @_;
+
+	my ($flag,$min);
+	if(defined $msg && $msg =~ /^(\w)(?: (\d+))?$/){
+		$flag = $1;
+		$min = $2;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: .$command flag [days] | lists users and the number of days since they were last seen. If days is specified it will only list users with at least that amount of idle time.");
+		return;
+	}
 
 	if (officer()){
 		my $f = $ND::DBH->prepare(qq{SELECT username,last
@@ -128,11 +163,15 @@ 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(amount) AS 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 ? GROUP BY username ORDER BY amount DESC
 			});
 		$f->execute($ship);
 		my $text;
@@ -153,16 +192,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;