X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FUsermgm.pm;h=8dda53aaac5b3ac29c475a967a32b7ec397bf2f9;hb=c1eaedd9ead680180a5c52a70f3cf67490057b40;hp=00ebeb0d77ff4064b871a9b13d52e56489c32b18;hpb=1ab264ec25caff50e2ad8e55947b5b09e8a08e90;p=NDIRC.git

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 00ebeb0..8dda53a 100644
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -26,6 +26,7 @@ use NDIRC::Dispatcher;
 
 command '+user' => {
 	help => q(syntax: .+user username [pnick] | username must be alphanum characters, if no pnick is given then it will be set to the same as username),
+	type => q(usermgmt),
 	acl => 'irc_adduser'
 }, class extends NDIRC::Command {
 	method execute ($c,$msg) {
@@ -44,7 +45,7 @@ FROM users WHERE username = $1 OR hostmask = $2 OR pnick = $3
 			$c->reply("<b>$username ($p_nick)</b> already exists with host: <b>$hostname</b>");
 		}else{
 			$dbh->do(q{
-INSERT INTO users (username,hostmask,pnick,password) VALUES(?,?,?,'')
+INSERT INTO users (username,hostmask,pnick) VALUES($1,$2,$3)
 				},undef,$nick,$host,$pnick);
 			$c->reply("Added <b>$nick(/$pnick)</b> with host: <b>$host</b>");
 		}
@@ -53,6 +54,7 @@ INSERT INTO users (username,hostmask,pnick,password) VALUES(?,?,?,'')
 
 command '-user' => {
 	help => q(syntax: .-user nick | nick must be alphanum characters, if no pnick is given then it will be set to nick),
+	type => q(usermgmt),
 	acl => 'irc_deactivateuser'
 }, class extends NDIRC::Command {
 	method execute ($c,$msg) {
@@ -65,7 +67,7 @@ command '-user' => {
 
 		if ($f->rows == 1){
 			my $updated = $dbh->do(q{
-UPDATE users SET hostmask = ?, password = '' WHERE uid = ?
+UPDATE users SET hostmask = $1, password = NULL WHERE uid = $2
 				},undef,$username,$uid);
 			if ($updated > 0){
 				my $groups = $dbh->do(q{DELETE FROM groupmembers WHERE uid = ?},undef,$uid);
@@ -85,6 +87,7 @@ UPDATE users SET hostmask = ?, password = '' WHERE uid = ?
 
 command chattr => {
 	help => q(syntax: .chattr username [-]flags | % can be used for wildcards \%arro% will match barrow, if a - is given then flags will be removed, otherwise added),
+	type => q(usermgmt),
 	acl => 'irc_chattr'
 }, class extends NDIRC::Command {
 	method execute ($c,$msg) {
@@ -414,6 +417,42 @@ SELECT username,hostmask,pnick FROM users WHERE hostmask = $1 OR pnick = $2
 	}
 };
 
+command setdiscordid => {
+	help => q(Usage: .setdiscordid username discordid | Changes a user's discord id/tag Nick#id),
+	acl => q(bot_setdiscordid)
+}, class extends NDIRC::Command {
+	method execute ($c,$msg) {
+		my ($nick,$discordid) = $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){
+			eval{
+				$dbh->do(q{UPDATE users SET discord_id = NULLIF($1, 'NULL') WHERE uid = $2}
+					,undef,$discordid,$user->{uid});
+				$c->reply("Updated <b>$user->{username}</b>'s discord id to: <b>$discordid</b>");
+			};
+			if($@){
+				if ($@ =~ /duplicate key value violates unique constraint/){
+					my ($username, $discordid) = $dbh->selectrow_array(q{
+SELECT username,discord_id FROM users WHERE discord_id = $1
+						},undef,$discordid);
+					$c->reply("<c04>Problem</c>, <b>$username</b> already uses discord id <b>$discordid</b>.");
+				}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;
+	}
+};
+
 my $points = class extends NDIRC::Command {
 	has point => (
 		is => 'ro',
@@ -523,7 +562,7 @@ command getanti => {
 		my $f = $dbh->prepare(q{
 SELECT username, ship, amount, CASE WHEN $1 = t1 THEN 't1' ELSE 't2' END AS t
 FROM available_ships a
-	JOIN ship_stats s ON (a.ship = s.name)
+	JOIN ship_stats s USING (ship)
 WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
 	AND class = ANY($2)
 	AND $1 IN (t1,t2)
@@ -546,4 +585,45 @@ ORDER BY amount*(metal+crystal+eonium)*CASE WHEN $1 = t1 THEN 1.0 ELSE 0.6 END D
 	}
 };
 
+command getpass => {
+	help => q(Gives new users a random password.),
+	type => q(pm)
+}, class extends NDIRC::Command {
+
+###########################################################
+# Written by Guy Malachi http://guymal.com
+# 18 August, 2002
+###########################################################
+	sub generate_random_string
+	{
+		my $length_of_randomstring=shift;# the length of
+		# the random string to generate
+
+		my @chars=('a'..'z','A'..'Z','0'..'9','_');
+		my $random_string;
+		foreach (1..$length_of_randomstring)
+		{
+			# rand @chars will generate a random
+			# number between 0 and scalar @chars
+			$random_string .= $chars[rand @chars];
+		}
+		return $random_string;
+	}
+
+	method execute ($c,$msg) {
+		my $dbh = $c->model;
+
+		my $password = generate_random_string 16;
+		my $update = $dbh->do(q{
+UPDATE users SET password = $1
+WHERE uid = $2 AND password IS NULL
+			},undef,$password,$c->uid);
+		if ($update > 0){
+			$c->reply("Password set to: $password (you can change it on webbie)");
+		}else{
+			$c->reply("Couldn't set password. Either it has already been set or you don't have an account");
+		}
+	}
+};
+
 1;