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

diff --git a/Commands/Members.pm b/Commands/Members.pm
index 1a759b7..b1f4da9 100644
--- a/Commands/Members.pm
+++ b/Commands/Members.pm
@@ -32,8 +32,9 @@ 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 USING (call)
 	LEFT OUTER JOIN users dc ON dc.uid = c.dc
@@ -44,7 +45,6 @@ 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) |"
 	}
@@ -63,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 = "";