Make it possible to remove members of specified groups from .flag listing

[NDIRC.git] / Commands / Usermgm.pm

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index adda73f80de3eb170aa75e834198967ab70f7891..cf5b8536f22da04beb17f2c56bd2517cdcdb0476 100644 (file)
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -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,7 +100,7 @@ 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 = ANY($2)
                        });
@@ -164,19 +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 array_to_string(array_agg(username),', '),count(username)
 FROM (SELECT uid, username FROM users ORDER BY username) u
        JOIN groupmembers gm USING (uid)
-WHERE gid = $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("<b>$count</b> Users with flag <b>$flag</b>: $users");
 }