Added allygals command

diff --git a/Commands/Intel.pm b/Commands/Intel.pm
index 54e7e3bdc0acbb072532444a8a82aa95c1a66b1f..2b39d4be38e6cd0aac1768633841b5fee46d9ba5 100644 (file)
--- a/Commands/Intel.pm
+++ b/Commands/Intel.pm
@@ -257,4 +257,39 @@ SELECT coords(x,y,z) FROM current_planet_stats WHERE alliance = $1 ORDER BY x,y,
        my $kmem = scalar @planets;
        $c->reply("$a ($kmem/$members) : ". join " ", @planets);
 }
        my $kmem = scalar @planets;
        $c->reply("$a ($kmem/$members) : ". join " ", @planets);
 }

+
+sub allygals
+       : Help(Usage: .allygals ally [min] | lists gals with a minimum of 3, or specified, allied planets. % can be used for wildcards \%-crew\% will match [F-Crew])
+       : ACL(irc_allygals)
+{
+       my ($self,$c,$msg) = @_;
+       my ($ally,$min) = $msg =~ /^(\S+)(?: (\d+))?$/ or die 'ARGS';
+       my $dbh = $c->model;
+       $min //= 3;
+
+       my ($a) = $dbh->selectrow_array(q{
+SELECT alliance
+FROM alliances JOIN alliance_stats USING (aid)
+WHERE tick = (SELECT max(tick) FROM alliance_stats)
+       AND alliance ILIKE $1
+               },undef,$ally);
+       unless ($a){
+               $c->reply("No alliance matching '$ally'");
+               return;
+       }
+       my $query = $dbh->prepare(q{
+SELECT x,y, count(*) FROM current_planet_stats WHERE alliance = $1
+GROUP BY x,y
+HAVING count(*) >= $2
+ORDER BY count DESC,x,y
+               });
+       $query->execute($a,$min);
+       my @gals;
+       while (my $g = $query->fetchrow_hashref){
+               push @gals,"$g->{x}:$g->{y} ($g->{count})";
+       }
+       my $kgals = scalar @gals;
+       $c->reply("$a ($kgals) : ". join " ", @gals);
+}
+

 1;
 1;

diff --git a/database/roles.sql b/database/roles.sql
index 5ef73e64d0a9a529e7d4a2f799f5f14f6564a0a2..a424e1ce89e468d88e93ef144edf262c39811af0 100644 (file)
--- a/database/roles.sql
+++ b/database/roles.sql
@@ -43,6 +43,7 @@ INSERT INTO roles VALUES('irc_deltag');
 INSERT INTO roles VALUES('irc_say');
 INSERT INTO roles VALUES('irc_cmd');
 INSERT INTO roles VALUES('irc_allycoords');
 INSERT INTO roles VALUES('irc_say');
 INSERT INTO roles VALUES('irc_cmd');
 INSERT INTO roles VALUES('irc_allycoords');

+INSERT INTO roles VALUES('irc_allygals');

 
 INSERT INTO group_roles (gid,role) VALUES('T','irc_p_nick');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_p_intel');
 
 INSERT INTO group_roles (gid,role) VALUES('T','irc_p_nick');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_p_intel');


@@ -84,6 +85,7 @@ INSERT INTO group_roles (gid,role) VALUES('T','irc_forum_others');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_say');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_cmd');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_allycoords');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_say');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_cmd');
 INSERT INTO group_roles (gid,role) VALUES('T','irc_allycoords');

+INSERT INTO group_roles (gid,role) VALUES('T','irc_allygals');

 
 INSERT INTO group_roles (gid,role) VALUES('M','irc_gs');
 INSERT INTO group_roles (gid,role) VALUES('M','irc_scan');
 
 INSERT INTO group_roles (gid,role) VALUES('M','irc_gs');
 INSERT INTO group_roles (gid,role) VALUES('M','irc_scan');


@@ -128,6 +130,7 @@ INSERT INTO group_roles (gid,role) VALUES('H','irc_sendsms');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_smsstatus');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_forum_others');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_allycoords');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_smsstatus');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_forum_others');
 INSERT INTO group_roles (gid,role) VALUES('H','irc_allycoords');

+INSERT INTO group_roles (gid,role) VALUES('H','irc_allygals');

 
 INSERT INTO group_roles (gid,role) VALUES('B','irc_points_others');
 INSERT INTO group_roles (gid,role) VALUES('B','irc_a');
 
 INSERT INTO group_roles (gid,role) VALUES('B','irc_points_others');
 INSERT INTO group_roles (gid,role) VALUES('B','irc_a');


@@ -139,6 +142,7 @@ INSERT INTO group_roles (gid,role) VALUES('I','irc_setnick');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_setally');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_setchannel');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_allycoords');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_setally');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_setchannel');
 INSERT INTO group_roles (gid,role) VALUES('I','irc_allycoords');

+INSERT INTO group_roles (gid,role) VALUES('I','irc_allygals');

 
 INSERT INTO group_roles (gid,role) VALUES('D','irc_p_intel');
 INSERT INTO group_roles (gid,role) VALUES('D','irc_points_others');
 
 INSERT INTO group_roles (gid,role) VALUES('D','irc_p_intel');
 INSERT INTO group_roles (gid,role) VALUES('D','irc_points_others');