X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=83c27ca0681bd19111f68c305a887b0921ce313f;hb=a57f94a968f33e287a26fbb8c9e97c11b0966b67;hp=3c58aebd8dabec6a888c3e161cae34154ec6efbb;hpb=7c7b5c9c679147e5dbf172a312ed7ef992a9e63c;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 3c58aeb..83c27ca 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -163,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;
@@ -188,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;