From: Michael Andreen <harv@ruin.nu>
Date: Sat, 16 May 2009 17:55:26 +0000 (+0200)
Subject: Converted .getships and .shipshome
X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=commitdiff_plain;h=2cc4a8683c21bee13c36eb4c24954d7f57f4e967

Converted .getships and .shipshome
---

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 3563b84..101ea06 100644
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -247,4 +247,48 @@ WHERE username ILIKE $1 ORDER BY lower(username)
 	$c->reply("<b>$i</b> Users(days): $text");
 }
 
+sub getships
+	: Help(Usage: .getships ship | % can be used as wildcard, e.g. beet%, shipshome shows the number of ships currently home)
+	: Alias(shipshome)
+	: ACL(irc_getships)
+{
+	my ($self,$c,$msg) = @_;
+	my ($ship) = $msg =~ /^(\S+)$/ or die 'ARGS';
+	my $dbh = $c->model;
+
+	my $f = $dbh->prepare(q{
+SELECT username,SUM(fs.amount) AS amount
+FROM users u
+	JOIN (SELECT DISTINCT ON (planet) planet,fid FROM fleets
+		WHERE mission = 'Full fleet' AND name <> 'Unit'
+		ORDER BY planet,tick DESC,fid DESC
+	) f  USING (planet)
+	JOIN fleet_ships fs USING (fid)
+WHERE ship ILIKE $1 AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
+GROUP BY username ORDER BY amount DESC
+		});
+	if ($self->name eq 'shipshome'){
+		$f = $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;
+	my $total = 0;
+	while (my $user = $f->fetchrow_hashref){
+		$text .= "$user->{username}: $user->{amount} ";
+		$i++;
+		$total += $user->{amount};
+	}
+	if ($text){
+		$c->reply("<b>$i</b> Users with <b>$total $ship</b>: $text");
+	}else{
+		$c->reply("Couldn't find any user with <b>$ship</b>");
+	}
+}
+
 1;
diff --git a/Usermgm.pm b/Usermgm.pm
index b24e3e1..21fbce8 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -25,50 +25,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addPoints setHost setPNick getShips getFleet/;
-
-sub getShips {
-	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,SUM(fs.amount) AS amount
-			FROM users u 
-				JOIN (SELECT DISTINCT ON (planet) planet,fid FROM fleets
-					WHERE mission = 'Full fleet' AND name <> 'Unit'
-					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;
-		my $total = 0;
-		while (my $user = $f->fetchrow_hashref){
-			$user->{last} = '?' unless defined $user->{last};
-			$text .= "$user->{username}: $user->{amount} ";
-			$i++;
-			$total += $user->{amount};
-		}
-		if ($text){
-			$ND::server->command("notice $ND::nick $ND::B$i$ND::B Users with $ND::B$total $ship$ND::B: $text");
-		}else{
-			$ND::server->command("msg $ND::target $ND::B$i$ND::B Couldn't find any user with $ND::B$ship$ND::B:");
-		}
-	}
-}
+our @EXPORT = qw/addPoints setHost setPNick getFleet/;
 
 sub getFleet {
 	my ($nick,$command) = @_;
diff --git a/database/roles.sql b/database/roles.sql
index 5051286..f618bd0 100644
--- a/database/roles.sql
+++ b/database/roles.sql
@@ -16,6 +16,7 @@ INSERT INTO roles VALUES('irc_whois');
 INSERT INTO roles VALUES('irc_flag');
 INSERT INTO roles VALUES('irc_laston');
 INSERT INTO roles VALUES('irc_lastseen');
+INSERT INTO roles VALUES('irc_getships');
 
 INSERT INTO group_roles (gid,role) VALUES(1,'irc_p_nick');
 INSERT INTO group_roles (gid,role) VALUES(1,'irc_p_intel');
@@ -33,6 +34,7 @@ INSERT INTO group_roles (gid,role) VALUES(1,'irc_whois');
 INSERT INTO group_roles (gid,role) VALUES(1,'irc_flag');
 INSERT INTO group_roles (gid,role) VALUES(1,'irc_laston');
 INSERT INTO group_roles (gid,role) VALUES(1,'irc_lastseen');
+INSERT INTO group_roles (gid,role) VALUES(1,'irc_getships');
 
 INSERT INTO group_roles (gid,role) VALUES(2,'irc_gs');
 INSERT INTO group_roles (gid,role) VALUES(2,'irc_scan');
@@ -52,6 +54,7 @@ INSERT INTO group_roles (gid,role) VALUES(3,'irc_whois');
 INSERT INTO group_roles (gid,role) VALUES(3,'irc_flag');
 INSERT INTO group_roles (gid,role) VALUES(3,'irc_laston');
 INSERT INTO group_roles (gid,role) VALUES(3,'irc_lastseen');
+INSERT INTO group_roles (gid,role) VALUES(3,'irc_getships');
 
 INSERT INTO group_roles (gid,role) VALUES(4,'irc_points_others');
 
@@ -61,6 +64,7 @@ INSERT INTO group_roles (gid,role) VALUES(5,'irc_p_intel');
 INSERT INTO group_roles (gid,role) VALUES(6,'irc_p_intel');
 INSERT INTO group_roles (gid,role) VALUES(6,'irc_points_others');
 INSERT INTO group_roles (gid,role) VALUES(6,'irc_sms');
+INSERT INTO group_roles (gid,role) VALUES(6,'irc_getships');
 
 INSERT INTO group_roles (gid,role) VALUES(8,'irc_scanreqs');
 INSERT INTO group_roles (gid,role) VALUES(8,'irc_anonscan');