Updated intel commands

[NDIRC.git] / Usermgm.pm

diff --git a/Usermgm.pm b/Usermgm.pm
index a537f770ed8f93bc0166a5ce4c850a5fe968d0e8..83c27ca0681bd19111f68c305a887b0921ce313f 100644 (file)
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -58,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);
@@ -75,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()){
@@ -89,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{
@@ -145,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;
@@ -170,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;