our @ISA = qw/Exporter/;
-our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips/;
+our @EXPORT = qw/addUser whois flags flag laston addPoints chattrG setHost setPNick deactivateUser getShips getFleet/;
sub addUser {
my ($msg, $command) = @_;
}
}
sub whois {
- my ($nick) = @_;
- DB();
- if (officer()){
+ my ($msg, $command) = @_;
+
+ my ($nick);
+ if(defined $msg && $msg =~ /^(\S+)$/){
+ $nick = $1;
+ }else{
+ $ND::server->command("notice $ND::nick syntax: .$command nick | % can be used for wildcards \%arro% will match barrow");
+ return;
+ }
+ if (officer() || ia()){
my $f = $ND::DBH->prepare("SELECT username, hostmask, concat(flag) FROM users u LEFT OUTER JOIN (SELECT uid,flag FROM groupmembers NATURAL JOIN groups ORDER BY uid,flag ) g ON g.uid = u.uid WHERE username ILIKE ? GROUP BY username,hostmask");
$f->execute($nick);
while (my @row = $f->fetchrow()){
}
sub flags {
- my ($nick) = @_;
- DB();
- unless ($1){
+ my ($msg, $command) = @_;
+
+ my ($nick);
+ if(defined $msg && $msg =~ /^(\S+)$/){
+ $nick = $1;
+ }else{
my ($flags) = $ND::DBH->selectrow_array("SELECT TRIM(', ' FROM concat(flag||':'||groupname||', ')) FROM groups");
- $ND::server->command("msg $ND::target $flags");
- }elsif (hc()){
+ $ND::server->command("notice $ND::nick syntax: .$command nick | % can be used for wildcards \%arro% will match barrow | Current flags: $flags");
+ return;
+ }
+ if (hc()){
my $f = $ND::DBH->prepare("SELECT username, concat(flag), TRIM(', ' FROM concat(groupname||', ')) FROM users u LEFT OUTER JOIN (SELECT uid,flag,groupname FROM groupmembers NATURAL JOIN groups ORDER BY uid,flag ) g ON g.uid = u.uid WHERE username ILIKE ? GROUP BY username,hostmask");
$f->execute($nick);
while (my @row = $f->fetchrow()){
if ($f->rows == 0){
$ND::server->command("msg $ND::target No hit, maybe spelling mistake, or add % as wildcard");
}
- }else{
- $ND::server->command("msg $ND::target Only HCs are allowed to check that");
}
}
return;
}
- if (officer()|| ($ND::target eq $ND::scanchan && $flag eq 'S')){
+ if (officer() || ia() || ($ND::target eq $ND::scanchan && $flag eq 'S')){
my $f = $ND::DBH->prepare(qq{
SELECT TRIM(', ' FROM concat(username||', ')),count(username) FROM
(SELECT uid, username FROM users ORDER BY username) u NATURAL JOIN groupmembers gm
sub laston {
my ($msg, $command) = @_;
- my ($flag,$min);
- if(defined $msg && $msg =~ /^(\w)(?: (\d+))?$/){
- $flag = $1;
- $min = $2;
- }else{
- $ND::server->command("notice $ND::nick syntax: .$command flag [days] | lists users and the number of days since they were last seen. If days is specified it will only list users with at least that amount of idle time.");
- return;
- }
+ if (officer() || ia()){
+ my ($flag,$min);
+ my $f;
+ if(defined $msg && $msg =~ /^(\w)(?: (\d+)(?:\|(\d+)\|(\d+))?)?$/){
+ $flag = $1;
+ $min = $2;
+ my $forum = $3;
+ my $claim = $4;
+ $min = 0 unless defined $min;
+ $f = $ND::DBH->prepare(q{SELECT username, last
+ ,COALESCE(lastforum::text,'?') AS lastforum
+ ,COALESCE(lastclaim::text,'?') AS lastclaim
+ FROM (SELECT username
+ ,date_part('day',now() - laston)::int AS last
+ ,date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid)) AS lastforum
+ ,date_part('day',now() - (SELECT max(timestamp) FROM raid_claims WHERE uid = u.uid)) AS lastclaim
+ FROM users u
+ NATURAL JOIN groupmembers
+ NATURAL JOIN groups
+ WHERE flag = $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
+ });
+ $f->execute($flag,$min,$forum,$claim);
+ }elsif(defined $msg && $msg =~ /^(\S+)$/){
+ $f = $ND::DBH->prepare(q{SELECT username
+ ,date_part('day',now() - laston)::int AS last
+ ,COALESCE(date_part('day',now() - (SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid))::text,'?')
+ AS lastforum
+ ,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)
+ });
+ $f->execute($1);
+ }else{
+ $ND::server->command("notice $ND::nick syntax: .$command <flag [days]|nick> | lists users and the number of days since they were last seen (irc|forum|claim). If days is specified it will only list users with at least that amount of idle time.");
+ return;
+ }
- if (officer()){
- my $f = $ND::DBH->prepare(qq{SELECT username,last
- FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,laston FROM users) u NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag = ? AND (last >= ? OR last IS NULL) ORDER BY laston
- });
- $min = 0 unless defined $min;
- $f->execute($flag,$min);
my $text;
my $i = 0;
while (my $user = $f->fetchrow_hashref){
$user->{last} = '?' unless defined $user->{last};
- $text .= "$user->{username}($user->{last}) ";
+ $text .= "$user->{username}($user->{last}|$user->{lastforum}|$user->{lastclaim}) ";
$i++;
}
- $ND::server->command("msg $ND::target $ND::B$i$ND::B Users(days) with flag $ND::B$flag$ND::B: $text");
+ $ND::server->command("msg $ND::target $ND::B$i$ND::B Users(days)".(defined $flag ? " with flag $ND::B$flag$ND::B" : "").": $text");
}else{
$ND::server->command("msg $ND::target Only officers are allowed to check that");
}
sub getShips {
- my ($ship) = @_;
+ my ($ship,$command) = @_;
+ unless (defined $ship){
+ $ND::server->command("notice $ND::nick Usage: .$command ship | % can be used as wildcard, e.g. beet%");
+ return;
+ }
if (officer() || dc()){
- my $f = $ND::DBH->prepare(qq{SELECT username,amount
- FROM users u JOIN fleets f USING (uid) JOIN fleet_ships fs ON f.id = fs.fleet WHERE f.fleet = 0 AND ship ILIKE ? ORDER BY amount DESC
- });
+ my $f = $ND::DBH->prepare(qq{SELECT username,SUM(fs.amount) AS amount
+ FROM users u
+ JOIN (SELECT DISTINCT ON (sender) sender AS planet,id FROM fleets
+ WHERE mission = 'Full fleet' AND name <> 'Unit'
+ ORDER BY sender,tick DESC,id DESC) f USING (planet)
+ JOIN fleet_ships fs ON f.id = fs.id
+ WHERE ship ILIKE ?
+ GROUP BY username ORDER BY amount DESC
+ });
$f->execute($ship);
my $text;
my $i = 0;
}
}
+sub getFleet {
+ my ($nick,$command) = @_;
+
+ unless (defined $nick){
+ $ND::server->command("notice $ND::nick Usage: $command nick | % can be used as wildcard, e.g. barr%");
+ return;
+ }
+ if (officer() || dc()){
+ my $f = $ND::DBH->prepare(q{SELECT fs.ship, fs.amount, username
+ FROM fleet_ships fs
+ JOIN (SELECT id,username
+ FROM fleets f
+ JOIN users u ON u.planet = f.sender
+ WHERE mission = 'Full fleet' AND name <> 'Unit'
+ AND username ILIKE $1
+ ORDER BY planet,tick DESC,id DESC
+ LIMIT 1
+ ) f USING (id)
+ ORDER BY num
+ });
+ $f->execute($nick);
+ my $text;
+ my $username;
+ while (my $ship = $f->fetchrow_hashref){
+ unless (defined $username) {
+ $username = $ship->{username};
+ $text = "$ND::B$username$ND::O has: "
+ }
+ $text .= "$ship->{ship} $ship->{amount} ";
+ }
+ if ($text){
+ $ND::server->command("notice $ND::nick $text");
+ }else{
+ $ND::server->command("notice $ND::nick Couldn't find any fleet for $nick");
+ }
+ }
+}
+
sub addPoints {
- my ($t,$nick,$p) = @_;
- DB();
+ my ($msg, $t) = @_;
+
+ my ($nick, $points);
+ if(defined $msg && $msg =~ /^(\S+)(?: (-?(\d+)?(\.\d+)?))?$/){
+ $nick = $1;
+ $points = $2;
+ }else{
+ $ND::server->command("notice $ND::nick syntax: .$t nick [points] | % can be used for wildcards \%arro\% will match barrow, if the number of points isn't specified, then 1 will be assumed.");
+ return;
+ }
if ( ($t eq "d" && dc())
|| ($t eq "a" && bc())
|| ($t eq "h" && officer())
|| ($t eq "s" && scanner())){
- my $points = 1;
- if ($p){
- $points = $p;
- }
+ $points = 1 unless (defined $points);
if ($points*$points > 400){
$ND::server->command("msg $ND::target Values between -20 and 20 please");
return;
projects / NDIRC.git / blobdiff