}
}
sub whois {
- my ($nick) = @_;
- DB();
+ 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()){
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);
}
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");
}
}
sub flag {
- my ($flag) = @_;
+ my ($msg, $command) = @_;
+
+ my ($flag);
+ if(defined $msg && $msg =~ /^(\w)$/){
+ $flag = $1;
+ }else{
+ $ND::server->command("notice $ND::nick syntax: .$command flag");
+ return;
+ }
if (officer()|| ($ND::target eq $ND::scanchan && $flag eq 'S')){
my $f = $ND::DBH->prepare(qq{
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;
- }
-
+ my $f;
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);
+ if(defined $msg && $msg =~ /^(\w)(?: (\d+))?$/){
+ $flag = $1;
+ $min = $2;
+ $min = 0 unless defined $min;
+ $f = $ND::DBH->prepare(qq{SELECT username,last,lastforum
+ FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,date_part('day',now() - last_forum_visit)::int AS lastforum, laston FROM users) u NATURAL JOIN groupmembers NATURAL JOIN groups WHERE flag = ? AND (last >= ? OR last IS NULL) ORDER BY laston
+ });
+ $f->execute($flag,$min);
+ }elsif(defined $msg && $msg =~ /^(\S+)$/){
+ $f = $ND::DBH->prepare(qq{SELECT username,last,lastforum
+ FROM (SELECT uid,username, date_part('day',now() - laston)::int AS last,date_part('day',now() - last_forum_visit)::int AS lastforum, laston FROM users) u WHERE username ILIKE ? 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). If days is specified it will only list users with at least that amount of idle time.");
+ return;
+ }
+
my $text;
my $i = 0;
while (my $user = $f->fetchrow_hashref){
$user->{last} = '?' unless defined $user->{last};
- $text .= "$user->{username}($user->{last}) ";
+ $user->{lastforum} = '?' unless defined $user->{lastforum};
+ $text .= "$user->{username}($user->{last}|$user->{lastforum}) ";
$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 addPoints {
- my ($t,$nick,$p) = @_;
- DB();
+ my ($msg, $t) = @_;
+
+ my ($nick, $points);
+ if(defined $msg && $msg =~ /^(\S+)(?: (-?\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