}
my $f = $c->model->prepare(q{
-WITH p AS (SELECT coords(x,y,z),ruler,planet,race,score,size,value,scorerank,sizerank,
+WITH p AS (SELECT pid,coords(x,y,z),ruler,planet,race,score,size,value,scorerank,sizerank,
valuerank, xp, xprank, alliance, relationship, nick, planet_status, hit_us, channel
FROM current_planet_stats
WHERE (x = $1 AND y = $2 and z = $3) OR nick ILIKE $4 LIMIT 1
)
SELECT * FROM p, tags;
});
- $f->execute($x,$y,$z,$nick,$c->uid,$c->check_user_roles(qw/irc_p_intel/));
+ $f->execute($x,$y,$z,$nick,$c->uid,$c->check_user_roles(qw/irc_p_intel/) // 0);
if (my $planet = $f->fetchrow_hashref()){
for (keys %{$planet}){
$planet->{$_} = valuecolor(1,$planet->{$_});
my ($self, $c, $msg) = @_;
my ($x,$y) = ($msg =~ /(\d+)\D+(\d+)/) or die 'ARGS';
+ my $dbh = $c->model;
- my $f = $c->model->prepare(q{
+ my $f = $dbh->prepare(q{
SELECT score,scorerank,size,sizerank,value,valuerank,planets
FROM galaxies WHERE x = ? AND y = ? AND tick = (SELECT max(tick) from galaxies)
- });
+ });
$f->execute($x,$y);
- while (my @row = $f->fetchrow()){
- @row = map (valuecolor(1),@row);
- $c->reply("$x:$y Score=$row[0] ($row[1]), Size=$row[2] ($row[3]), Value=$row[4] ($row[5]), Planets=$row[6]");
+ my @row = $f->fetchrow;
+ unless (@row){
+ $c->reply("No planet at $x:$y");
+ return;
+ }
+ my @planets;
+ if ($c->check_user_roles(qw/irc_g_intel/)) {
+ my $query = $dbh->prepare(q{
+SELECT z,COALESCE(nick,'?') AS nick,COALESCE(alliance,'?') AS alliance
+FROM current_planet_stats
+WHERE x = $1 AND y = $2 ORDER BY z
+ });
+ $query->execute($x,$y);
+ while(my $p = $query->fetchrow_hashref){
+ push @planets, "$p->{z} [$p->{nick}/$p->{alliance}]";
+ }
}
+ @row = map (valuecolor(1),@row);
+ $c->reply("$x:$y Score=$row[0] ($row[1]), Size=$row[2] ($row[3]), Value=$row[4] ($row[5]), Planets=$row[6] - "
+ . join " ", @planets);
}
sub time