X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FUsermgm.pm;h=cf5b8536f22da04beb17f2c56bd2517cdcdb0476;hb=10707d9620d6beadaaa0faf0fe3c2ad28013175d;hp=3563b84fc12b7754b6dfb41330adff97ea6ed8cb;hpb=51ff7a3cc079e17dd0c11eb90a6b28a0ef51d409;p=NDIRC.git diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm index 3563b84..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); @@ -247,4 +248,241 @@ WHERE username ILIKE $1 ORDER BY lower(username) $c->reply("$i Users(days): $text"); } +sub getships + : Help(Usage: .getships ship | % can be used as wildcard, e.g. beet%, shipshome shows the number of ships currently home) + : Alias(shipshome) + : ACL(irc_getships) +{ + my ($self,$c,$msg) = @_; + my ($ship) = $msg =~ /^(\S+)$/ or die 'ARGS'; + my $dbh = $c->model; + + my $f = $dbh->prepare(q{ +SELECT username,SUM(fs.amount) AS amount +FROM users u + JOIN (SELECT DISTINCT ON (pid) pid,fid FROM fleets + WHERE mission = 'Full fleet' AND name <> 'Unit' + 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 = '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 = 'M') +GROUP BY username ORDER BY amount DESC + }); + } + $f->execute($ship); + my $text; + my $i = 0; + my $total = 0; + while (my $user = $f->fetchrow_hashref){ + $text .= "$user->{username}: $user->{amount} "; + $i++; + $total += $user->{amount}; + } + if ($text){ + $c->reply("$i Users with $total $ship: $text"); + }else{ + $c->reply("Couldn't find any user with $ship"); + } +} + +sub getfleet + : Help(Usage: .getfleet username | % can be used as wildcard, e.g. barr%) + : ACL(irc_getfleet) +{ + my ($self,$c,$msg) = @_; + my ($nick) = $msg =~ /^(\S+)$/ or die 'ARGS'; + my $dbh = $c->model; + + my $f = $dbh->prepare(q{ +SELECT fs.ship, fs.amount, username +FROM fleet_ships fs + JOIN (SELECT fid,username + FROM fleets f + JOIN users u USING (pid) + WHERE mission = 'Full fleet' AND name <> 'Unit' + AND username ILIKE $1 + ORDER BY pid,tick DESC,fid DESC + LIMIT 1 + ) f USING (fid) +ORDER BY num + }); + $f->execute($nick); + my $text; + my $username; + while (my $ship = $f->fetchrow_hashref){ + unless (defined $username) { + $username = $ship->{username}; + $text = "$username has: " + } + $text .= "$ship->{ship} $ship->{amount} "; + } + if ($text){ + $c->reply($text); + }else{ + $c->reply("Couldn't find any fleet for $nick"); + } +} + +sub sethost + : Help(Usage: .sethost username [host] | if host isn't given then it resets to netgamers host) + : ACL(irc_sethost) +{ + my ($self,$c,$msg) = @_; + my ($nick,$host) = $msg =~ /^(\S+)(?: (\S+))?$/ or die 'ARGS'; + my $dbh = $c->model; + + my $f = $dbh->prepare(q{ +SELECT uid,username,pnick,hostmask FROM users WHERE username ILIKE ? + }); + $f->execute($nick); + my $user = $f->fetchrow_hashref; + if ($f->rows == 1){ + $host //= "$user->{pnick}.users.netgamers.org"; + eval{ + $dbh->do(q{UPDATE users SET hostmask = ? WHERE uid = ?} + ,undef,$host,$user->{uid}); + $c->reply("Updated $user->{username}'s host to: $host"); + }; + if($@){ + if ($@ =~ /duplicate key value violates unique constraint/){ + my ($username, $hostname) = $dbh->selectrow_array(q{ +SELECT username,hostmask FROM users WHERE hostmask = $1 + },undef,$host); + $c->reply("Problem, $username already uses host $hostname."); + }else{ + die $@; + } + } + }elsif ($f->rows == 0){ + $c->reply("No hit, maybe spelling mistake, or add % as wildcard"); + }else{ + $c->reply("More than 1 user matched, please refine the search"); + } + $f->finish; +} + +sub setpnick + : Help(Usage: .setpnick username pnick | Changes a user's pnick) + : ACL(irc_setpnick) +{ + my ($self,$c,$msg) = @_; + my ($nick,$pnick) = $msg =~ /^(\S+) (\S+)$/ or die 'ARGS'; + my $dbh = $c->model; + + my $f = $dbh->prepare(q{SELECT uid,username FROM users WHERE username ILIKE ?}); + $f->execute($nick); + my $user = $f->fetchrow_hashref; + if ($f->rows == 1){ + my $hostname = "$pnick.users.netgamers.org"; + eval{ + $dbh->do(q{UPDATE users SET pnick = ?, hostmask = ? WHERE uid = ?} + ,undef,$pnick,$hostname,$user->{uid}); + $c->reply("Updated $user->{username}'s pnick to: $pnick and hostname to $hostname"); + }; + if($@){ + if ($@ =~ /duplicate key value violates unique constraint/){ + my ($username, $hostname, $pnick) = $dbh->selectrow_array(q{ +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{ + die $@; + } + } + }elsif ($f->rows == 0){ + $c->reply("No hit, maybe spelling mistake, or add % as wildcard"); + }else{ + $c->reply("More than 1 user matched, please refine the search"); + } + $f->finish; +} + +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.) + : ACL(irc_a) +{ + my ($self,$c,$msg) = @_; + my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(:?\d+|\d*\.\d+)))?$/ or die 'ARGS'; + $points //= 1; + + my ($fleets) = $c->model->selectrow_array(q{ +SELECT count(*) FROM raids r + JOIN raid_targets rt ON r.id = rt.raid + JOIN raid_claims rc ON rt.id = rc.target +WHERE not launched AND tick + 24 > tick() + AND uid = (SELECT uid FROM users WHERE username ILIKE $1); + },undef,$nick); + + if ($fleets > 0 && $points > 0){ + $c->reply("$nick has $fleets claimed waves the last 24 ticks that aren't marked as launched, so no points."); + return; + } + addPoints($c, 'attack', $nick, $points); +} + +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.) + : ACL(irc_d) + : Type(def) +{ + my ($self,$c,$msg) = @_; + 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.) + : ACL(irc_s) +{ + my ($self,$c,$msg) = @_; + 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.) + : ACL(irc_h) +{ + my ($self,$c,$msg) = @_; + my ($nick,$points) = $msg =~ /^(\S+)(?: (-?(:?\d+|\d*\.\d+)))?$/ or die 'ARGS'; + + addPoints($c, 'humor', $nick, $points); +} + +sub addPoints { + my ($c,$type, $nick, $points) = @_; + $points //= 1; + + my $dbh = $c->model; + + if ($points*$points > 400){ + $c->reply("Values between -20 and 20 please"); + return; + } + + my $f = $dbh->prepare(q{SELECT uid,username FROM users WHERE username ILIKE ?}); + $f->execute($nick); + my $user = $f->fetchrow_hashref; + if ($f->rows == 1){ + $type .= "_points"; + $dbh->do(qq{UPDATE users SET $type = $type + ? WHERE uid = ?} + ,undef,$points,$user->{uid}); + $c->reply("$user->{username} has been given $points $type"); + }elsif ($f->rows == 0){ + $c->reply("No hit, maybe spelling mistake, or add % as wildcard"); + }else{ + $c->reply("More than 1 user matched, please refine the search"); + } + $f->finish; +} + 1;