X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FMembers.pm;h=b1f4da9a998bf8aa083a829063810a8c1ff1d18a;hb=139b1bb64717ec8be8d97d2d9efc6caaf9e800ca;hp=34ef7d605028efa790c8935fdf336a976019b3dc;hpb=f241cbc51514579eb2355d3a83bbe1fbd458dc54;p=NDIRC.git
diff --git a/Commands/Members.pm b/Commands/Members.pm
index 34ef7d6..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 = "";
@@ -107,10 +106,13 @@ sub sms
my ($self,$c,$msg) = @_;
my ($nick) = $msg =~ /(\S+)/ or die 'ARGS';
my $f = $c->model->prepare(q{
-SELECT username,COALESCE(sms,'nothing added') FROM users WHERE username ILIKE ?
+SELECT username,COALESCE(sms,'nothing added'), call_if_needed, timezone, sms_note
+ ,to_char(NOW() AT TIME ZONE timezone,'HH24:MI') AS time
+FROM users WHERE username ILIKE ?
});
- if (my ($username,$sms) = $c->model->selectrow_array($f,undef,$nick)){
- $c->reply("$username has sms $sms");
+ if (my ($username,$sms, $call, $timezone, $note, $time) = $c->model->selectrow_array($f,undef,$nick)){
+ $call = $call ? 'Wake up if needed' : 'Do not wake up';
+ $c->reply("$username has sms $sms, $call, $time ($timezone), $note ");
}else{
$c->reply("No hit, maybe spelling mistake, or add % as wildcard");
}