X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Usermgm.pm;h=a38e595b77fba09411b5811b82c9f27112b3426a;hb=e053b73d5ae0ca68e4f40463450fe2fae0ae737a;hp=493c05c445bfb4a82b9ae244d3204c7173bc8764;hpb=b7392dc113b14a269fe73871c57795e18fe7e271;p=NDIRC.git

diff --git a/Usermgm.pm b/Usermgm.pm
index 493c05c..a38e595 100644
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -25,171 +25,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/flag laston addPoints setHost setPNick getShips getFleet/;
-
-sub 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() || 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 
-	JOIN groups g ON g.gid = gm.gid
-WHERE flag = ?;
-			});
-		if (my ($users,$count) = $ND::DBH->selectrow_array($f,undef,$flag)){
-			$ND::server->command("msg $ND::target $ND::B$count$ND::B Users with flag $ND::B$flag$ND::B: $users");
-		}
-	}else{
-		$ND::server->command("msg $ND::target Only officers are allowed to check that");
-	}
-}
-
-sub laston {
-	my ($msg, $command) = @_;
-
-	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;
-		}
-
-		my $text;
-		my $i = 0;
-		while (my $user = $f->fetchrow_hashref){
-			$user->{last} = '?' unless defined $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)".(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,$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,SUM(fs.amount) AS amount
-			FROM users u 
-				JOIN (SELECT DISTINCT ON (planet) planet,fid FROM fleets
-					WHERE mission = 'Full fleet' AND name <> 'Unit'
-					ORDER BY planet,tick DESC,fid DESC) f  USING (planet) 
-				JOIN fleet_ships fs USING (fid)
-			WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
-			GROUP BY username ORDER BY amount DESC
-			});
-		if ($command eq 'shipshome'){
-			$f = $ND::DBH->prepare(q{
-SELECT username,SUM(amount) AS amount
-FROM available_ships
-WHERE ship ILIKE ? AND uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
-GROUP BY username ORDER BY amount DESC
-			});
-		}
-		$f->execute($ship);
-		my $text;
-		my $i = 0;
-		my $total = 0;
-		while (my $user = $f->fetchrow_hashref){
-			$user->{last} = '?' unless defined $user->{last};
-			$text .= "$user->{username}: $user->{amount} ";
-			$i++;
-			$total += $user->{amount};
-		}
-		if ($text){
-			$ND::server->command("notice $ND::nick $ND::B$i$ND::B Users with $ND::B$total $ship$ND::B: $text");
-		}else{
-			$ND::server->command("msg $ND::target $ND::B$i$ND::B Couldn't find any user with $ND::B$ship$ND::B:");
-		}
-	}
-}
-
-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 fid,username
-					FROM fleets f
-						JOIN users u USING (planet)
-					WHERE mission = 'Full fleet' AND name <> 'Unit'
-						AND username ILIKE $1
-					ORDER BY planet,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 = "$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");
-		}
-	}
-}
+our @EXPORT = qw/addPoints setPNick/;
 
 sub addPoints {
 	my ($msg, $t) = @_;
@@ -239,39 +75,6 @@ sub addPoints {
 	}
 }
 
-sub setHost {
-	my ($msg, $command) = @_;
-
-	my ($nick, $host);
-	if(defined $msg && $msg =~ /^(\S+) (\S+)$/){
-		$nick = $1;
-		$host = $2;
-	}else{
-		$ND::server->command("notice $ND::nick syntax: .sethost nick host | % can be used for wildcards \%arro% will match barrow");
-		return;
-	}
-	if (hc()){
-		my $f = $ND::DBH->prepare("SELECT uid,username FROM users WHERE username ILIKE ?");
-		$f->execute($nick);
-		my ($uid,$nick) = $f->fetchrow();
-		if ($f->rows == 1){
-			my ($username,$hostname) = $ND::DBH->selectrow_array("SELECT username, hostmask FROM users WHERE hostmask ILIKE ? AND NOT (username ILIKE ?)",undef,$host,$nick);
-			if ((not defined $username) && $ND::DBH->do("UPDATE users SET hostmask = ? WHERE uid = ?",undef,$host,$uid) > 0){
-				$ND::server->command("msg $ND::target Updated $ND::B$nick${ND::B}'s host to: $ND::B$host$ND::B");
-			}elsif(defined $username){
-				$ND::server->command("msg $ND::target $ND::B$username$ND::B already exists with host: $ND::B$hostname$ND::B.");
-			}else{
-				$ND::server->command("msg $ND::target Couldn't update $ND::B$username${ND::B}'s host");
-			}
-		}elsif ($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 More than 1 user matched, please refine the search");
-		}
-		$f->finish;
-	}
-}
-
 sub setPNick {
 	my ($msg, $command) = @_;