X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FUsermgm.pm;h=cf5b8536f22da04beb17f2c56bd2517cdcdb0476;hb=06eb99af20cebc85b1f609becb125b4dc32bf8ff;hp=247fb33a18f1ed865942b3eca44e4e49e4b81ff5;hpb=66d9c4c699e149a366290b3891eea87650126b47;p=NDIRC.git
diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 247fb33..cf5b853 100644
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -40,7 +40,7 @@ sub adduser
my $host = "$pnick.users.netgamers.org";
my ($username,$hostname,$p_nick) = $dbh->selectrow_array(q{
SELECT username, hostmask,pnick
-FROM users WHERE username ILIKE ? OR hostmask ILIKE ? OR pnick ILIKE ?
+FROM users WHERE username = $1 OR hostmask = $2 OR pnick = $3
},undef,$nick,$host,$pnick);
if (defined $username){
@@ -92,7 +92,7 @@ sub chattr
{
my ($self,$c,$msg) = @_;
- my ($nick, $flags) = $msg =~ /^(\S+) ((\+|-)?\w+)$/ or die 'ARGS';
+ my ($nick, $mode, $flags) = $msg =~ /^(\S+) (\+|-)?(\w+)$/ or die 'ARGS';
my $dbh = $c->model;
my $f = $dbh->prepare(q{SELECT uid,username FROM users WHERE username ILIKE ?});
@@ -100,22 +100,23 @@ sub chattr
my $user = $f->fetchrow_hashref;
if ($f->rows == 1){
my $update;
- if ($flags =~ /^(-)/){
+ if ($mode ~~ '-'){
$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
});
@@ -163,20 +164,21 @@ GROUP BY username,pnick,hostmask LIMIT 5
}
sub flag
- : Help(syntax: .flag flag | Lists all users with the given flag.)
+ : Help(syntax: .flag flag [-noflags] | Lists all users with the given flag. Can specify a second argument to remove members that has any of those flags. .flag M -C lists all members that doesn't have community flag)
: ACL(irc_flag)
{
my ($self,$c,$msg) = @_;
- my ($flag) = $msg =~ /^(\w)$/ or die 'ARGS';
+ my ($flag,$noflag) = $msg =~ /^(\w)(?: -(\w+))?$/ or die 'ARGS';
+ $noflag //= '';
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 AND uid NOT IN (SELECT uid FROM groupmembers WHERE gid = ANY($2))
});
- my ($users,$count) = $c->model->selectrow_array($f,undef,$flag);
+ my @noflag = split //, $noflag;
+ my ($users,$count) = $c->model->selectrow_array($f,undef,$flag,\@noflag);
$c->reply("$count Users with flag $flag: $users");
}
@@ -201,12 +203,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 +235,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 +260,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 +305,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
@@ -352,7 +353,7 @@ SELECT uid,username,pnick,hostmask FROM users WHERE username ILIKE ?
if($@){
if ($@ =~ /duplicate key value violates unique constraint/){
my ($username, $hostname) = $dbh->selectrow_array(q{
-SELECT username,hostmask FROM users WHERE hostmask ILIKE $1
+SELECT username,hostmask FROM users WHERE hostmask = $1
},undef,$host);
$c->reply("Problem, $username already uses host $hostname.");
}else{
@@ -388,7 +389,7 @@ sub setpnick
if($@){
if ($@ =~ /duplicate key value violates unique constraint/){
my ($username, $hostname, $pnick) = $dbh->selectrow_array(q{
-SELECT username,hostmask,pnick FROM users WHERE hostmask ILIKE $1 OR pnick ILIKE $2
+SELECT username,hostmask,pnick FROM users WHERE hostmask = $1 OR pnick = $2
},undef,$hostname, $pnick);
$c->reply("Problem, $username already uses host $hostname and pnick $pnick.");
}else{