X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FUsermgm.pm;h=78c02b81d24431a0a9cf7b6d3156d72c59017fb8;hb=1ccb344994c1b517c662da9f236cf1c640780177;hp=deae5a2d93c0742f7b9dd7df19acbcb5b45ae79c;hpb=ca8f6135c9709112a5d6605ac34064f5946d9570;p=NDIRC.git
diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index deae5a2..78c02b8 100644
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -102,20 +102,21 @@ sub chattr
my $update;
if ($flags =~ /^(-)/){
$update = $dbh->prepare(q{
-DELETE FROM groupmembers WHERE uid = $1 AND
- gid IN (SELECT gid FROM groups WHERE flag = ANY($2))
+DELETE FROM groupmembers WHERE uid = $1 AND gid = ANY($2)
});
}else{
$update = $dbh->prepare(q{
-INSERT INTO groupmembers (uid,gid) (SELECT $1,gid FROM groups
- WHERE flag = ANY($2) AND gid NOT IN (SELECT gid FROM groupmembers WHERE uid = $1))
+INSERT INTO groupmembers (uid,gid)
+ (SELECT $1,gid FROM unnest($2::text[]) gid WHERE
+ gid NOT IN (SELECT gid FROM groupmembers WHERE uid = $1)
+ AND gid IN (SELECT gid FROM groups))
});
}
my @flags = split /\W*/,$flags;
$update->execute($user->{uid},\@flags);
$update = $dbh->prepare(q{
-SELECT concat(flag)
-FROM (SELECT uid,flag FROM groupmembers NATURAL JOIN groups ORDER BY uid,flag ) g
+SELECT array_to_string(array_agg(gid),'')
+FROM (SELECT uid,gid FROM groupmembers ORDER BY uid,gid ) g
WHERE uid = ?
});
$flags = $dbh->selectrow_array($update,undef,$user->{uid});
@@ -139,17 +140,17 @@ sub whois
unless ($nick){
my ($flags) = $dbh->selectrow_array(q{
-SELECT TRIM(', ' FROM concat(flag||':'||groupname||', ')) FROM groups
+SELECT array_to_string(array_agg(gid||':'||groupname),', ') FROM groups
});
$c->reply("Current flags: $flags");
return;
}
my $f = $dbh->prepare(q{
-SELECT username, pnick, hostmask, concat(flag) AS flags
+SELECT username, pnick, hostmask, array_to_string(array_agg(gid),'') AS flags
FROM users u
- LEFT OUTER JOIN (SELECT uid,flag FROM groupmembers
- NATURAL JOIN groups ORDER BY uid,flag ) g USING (uid)
+ LEFT OUTER JOIN (SELECT uid,gid FROM groupmembers ORDER BY uid,gid
+ ) g USING (uid)
WHERE username ILIKE ?
GROUP BY username,pnick,hostmask LIMIT 5
});
@@ -170,11 +171,10 @@ sub flag
my ($flag) = $msg =~ /^(\w)$/ or die 'ARGS';
my $f = $c->model->prepare(q{
-SELECT TRIM(', ' FROM concat(username||', ')),count(username)
+SELECT array_to_string(array_agg(username),', '),count(username)
FROM (SELECT uid, username FROM users ORDER BY username) u
JOIN groupmembers gm USING (uid)
- JOIN groups g USING (gid)
-WHERE flag = $1
+WHERE gid = $1
});
my ($users,$count) = $c->model->selectrow_array($f,undef,$flag);
$c->reply("$count Users with flag $flag: $users");
@@ -201,12 +201,11 @@ FROM (SELECT username
(SELECT max(timestamp) FROM raid_claims WHERE uid = u.uid)) AS lastclaim
FROM users u
NATURAL JOIN groupmembers
- NATURAL JOIN groups
- WHERE flag = $1
+ WHERE gid = $1
) a
WHERE COALESCE(last >= $2,TRUE) AND COALESCE(lastforum >= $3,TRUE)
AND COALESCE(lastclaim >= $4,TRUE)
-ORDER BY last DESC, lastforum DESC, lastclaim DESC
+ORDER BY a.last DESC, a.lastforum DESC, a.lastclaim DESC
});
$f->execute($flag,$min,$forum,$claim);
@@ -234,7 +233,7 @@ SELECT username, COALESCE(date_part('day',now() - laston)::text,'?') AS last
,COALESCE(date_part('day',now() - (SELECT max(timestamp)
FROM raid_claims WHERE uid = u.uid))::text,'?') AS lastclaim
FROM users u
-WHERE username ILIKE $1 ORDER BY lower(username)
+WHERE username ILIKE $1 ORDER BY username
});
$f->execute($username);
@@ -259,19 +258,19 @@ sub getships
my $f = $dbh->prepare(q{
SELECT username,SUM(fs.amount) AS amount
FROM users u
- JOIN (SELECT DISTINCT ON (planet) planet,fid FROM fleets
+ JOIN (SELECT DISTINCT ON (pid) pid,fid FROM fleets
WHERE mission = 'Full fleet' AND name <> 'Unit'
- ORDER BY planet,tick DESC,fid DESC
- ) f USING (planet)
+ ORDER BY pid,tick DESC,fid DESC
+ ) f USING (pid)
JOIN fleet_ships fs USING (fid)
-WHERE ship ILIKE $1 AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
+WHERE ship ILIKE $1 AND uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
GROUP BY username ORDER BY amount DESC
});
if ($self->name eq 'shipshome'){
$f = $dbh->prepare(q{
SELECT username,SUM(amount) AS amount
FROM available_ships
-WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
+WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
GROUP BY username ORDER BY amount DESC
});
}
@@ -304,10 +303,10 @@ SELECT fs.ship, fs.amount, username
FROM fleet_ships fs
JOIN (SELECT fid,username
FROM fleets f
- JOIN users u USING (planet)
+ JOIN users u USING (pid)
WHERE mission = 'Full fleet' AND name <> 'Unit'
AND username ILIKE $1
- ORDER BY planet,tick DESC,fid DESC
+ ORDER BY pid,tick DESC,fid DESC
LIMIT 1
) f USING (fid)
ORDER BY num
@@ -404,11 +403,11 @@ SELECT username,hostmask,pnick FROM users WHERE hostmask ILIKE $1 OR pnick ILIKE
}
sub a
- : Help(Usage: .a username [points] | % can be used for wildcards \%arro\% will match barrow, if the number of points isn't specified, then 1 will be assumed.)
+ : Help(Usage: .a username [points] | % can be used for wildcards %arro% will match barrow, if the number of points isn't specified, then 1 will be assumed.)
: ACL(irc_a)
{
my ($self,$c,$msg) = @_;
- my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(\d+)?(\.\d+)?))?$/ or die 'ARGS';
+ my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(:?\d+|\d*\.\d+)))?$/ or die 'ARGS';
$points //= 1;
my ($fleets) = $c->model->selectrow_array(q{
@@ -427,32 +426,32 @@ WHERE not launched AND tick + 24 > tick()
}
sub d
- : Help(Usage: .d username [points] | % can be used for wildcards \%arro\% will match barrow, if the number of points isn't specified, then 1 will be assumed.)
+ : Help(Usage: .d username [points] | % can be used for wildcards %arro% will match barrow, if the number of points isn't specified, then 1 will be assumed.)
: ACL(irc_d)
: Type(def)
{
my ($self,$c,$msg) = @_;
- my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(\d+)?(\.\d+)?))?$/ or die 'ARGS';
+ my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(:?\d+|\d*\.\d+)))?$/ or die 'ARGS';
addPoints($c, 'defense', $nick, $points);
}
sub s
- : Help(Usage: .s username [points] | % can be used for wildcards \%arro\% will match barrow, if the number of points isn't specified, then 1 will be assumed.)
+ : Help(Usage: .s username [points] | % can be used for wildcards %arro% will match barrow, if the number of points isn't specified, then 1 will be assumed.)
: ACL(irc_s)
{
my ($self,$c,$msg) = @_;
- my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(\d+)?(\.\d+)?))?$/ or die 'ARGS';
+ my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(:?\d+|\d*\.\d+)))?$/ or die 'ARGS';
addPoints($c, 'scan', $nick, $points);
}
sub h
- : Help(Usage: .h username [points] | % can be used for wildcards \%arro\% will match barrow, if the number of points isn't specified, then 1 will be assumed.)
+ : Help(Usage: .h username [points] | % can be used for wildcards %arro% will match barrow, if the number of points isn't specified, then 1 will be assumed.)
: ACL(irc_h)
{
my ($self,$c,$msg) = @_;
- my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(\d+)?(\.\d+)?))?$/ or die 'ARGS';
+ my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(:?\d+|\d*\.\d+)))?$/ or die 'ARGS';
addPoints($c, 'humor', $nick, $points);
}