Introduce a uid member for the context and use it intead of the host in commands

[NDIRC.git] / Commands / Members.pm

diff --git a/Commands/Members.pm b/Commands/Members.pm
index 1a759b7495348a9cb08cee7003f5988e821fb974..960728904c05feea288bba004d1757a5c0a231ec 100644 (file)
--- 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 = "";
@@ -80,7 +80,7 @@ sub points
 {
        my ($self,$c,$msg) = @_;
        my $f;
-       my $nick = $c->host;
+       my $nick = $c->uid;
        if ($msg =~ /(\S+)/ && $c->check_user_roles(qw/irc_points_others/)){
                $nick = $1;
                $f = $c->model->prepare(q{
@@ -90,7 +90,7 @@ FROM users WHERE username ILIKE ? LIMIT 5
        }else{
                $f = $c->model->prepare(q{
 SELECT username, attack_points, defense_points, scan_points, humor_points
-FROM users WHERE hostmask ILIKE ?
+FROM users WHERE uid = ?
                });
        }
        $f->execute($nick);
@@ -138,8 +138,8 @@ SELECT uid,username FROM users WHERE username ILIKE ?
                }, undef, $1);
        }else{
                $user = $dbh->selectrow_hashref(q{
-SELECT uid,username FROM users WHERE hostmask ILIKE ?
-               }, undef, $c->host);
+SELECT uid,username FROM users WHERE uid = ?
+               }, undef, $c->uid);
        }
        if ($user){
                my $unread = $dbh->selectrow_hashref(q{SELECT * FROM unread_posts($1)},undef,$user->{uid});