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

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 74bb7eb655f63b6e63ba89d8d5039d6567f18db6..cf5b8536f22da04beb17f2c56bd2517cdcdb0476 100644 (file)
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -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");
 }