X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FMembers.pm;h=b1f4da9a998bf8aa083a829063810a8c1ff1d18a;hb=1ccb344994c1b517c662da9f236cf1c640780177;hp=44cfe79d68ac3c62863fb2ec0d2c8f7d017af08f;hpb=0d6e6e233601ba9b1dd9fe874e804424a10fa09c;p=NDIRC.git

diff --git a/Commands/Members.pm b/Commands/Members.pm
index 44cfe79..b1f4da9 100644
--- a/Commands/Members.pm
+++ b/Commands/Members.pm
@@ -32,20 +32,19 @@ sub def
 {
 	my ($self,$c,$msg) = @_;
 	my $f = $c->model->prepare(q{
-SELECT (c.landing_tick - tick()) AS eta, concat(i.shiptype||'/') AS shiptype
-	, dc.username
+SELECT (c.landing_tick - tick()) AS eta
+	,array_to_string(array_agg(i.shiptype),'/') AS shiptype
+	,dc.username
 FROM calls c
-	JOIN incomings i ON i.call = c.id
+	JOIN incomings i USING (call)
 	LEFT OUTER JOIN users dc ON dc.uid = c.dc
-	JOIN users u ON u.uid = c.member
-WHERE open AND (c.landing_tick - tick()) >= 7
-GROUP BY c.id,c.landing_tick,dc.username
+WHERE status = 'Open' AND (c.landing_tick - tick()) >= 7
+GROUP BY call,c.landing_tick,dc.username
 ORDER BY c.landing_tick;
 		});
 	$f->execute();
 	my $calls = "";
 	while (my @row = $f->fetchrow()){
-		chop($row[1]);
 		my $dc = $row[2] // '';
 		$calls .= " (Anti $row[1] ETA: $row[0] DC: $dc) |"
 	}
@@ -64,7 +63,7 @@ sub raids
 	my $f = $c->model->prepare(q{
 SELECT id FROM raids
 WHERE open AND not removed AND tick + waves - 7 > tick()
-AND id IN (SELECT raid FROM raid_access WHERE gid = 2)
+AND id IN (SELECT raid FROM raid_access WHERE gid = 'M')
 		});
 	$f->execute();
 	my $calls = "";