X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FUsermgm.pm;h=f6da052fd468afbbddfd8b8d531906746239add2;hb=8727f6aa2a111483e54639e6d85d9865063f2b19;hp=7554fd4895acb11d9044f09487d7cd711505016f;hpb=adfcac8b7f2ec6bca4e7f5089c9ce0b772b6ad52;p=NDIRC.git

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 7554fd4..f6da052 100644
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -60,7 +60,7 @@ INSERT INTO users (username,hostmask,pnick,discord_id) VALUES($1,$2,$3,$4)
 };
 
 command '-user' => {
-	help => q(syntax: .-user nick | nick must be alphanum characters, if no pnick is given then it will be set to nick),
+	help => q(syntax: .-user nick | Deactivates a user),
 	type => q(usermgmt),
 	acl => 'irc_deactivateuser'
 }, class extends NDIRC::Command {
@@ -74,8 +74,8 @@ command '-user' => {
 
 		if ($f->rows == 1){
 			my $updated = $dbh->do(q{
-UPDATE users SET hostmask = $1, password = NULL WHERE uid = $2
-				},undef,$username,$uid);
+UPDATE users SET hostmask = NULL, discord_id = discord_id || '_', password = NULL WHERE uid = $1
+				},undef,$uid);
 			if ($updated > 0){
 				my $groups = $dbh->do(q{DELETE FROM groupmembers WHERE uid = ?},undef,$uid);
 				$groups += 0;
@@ -429,7 +429,7 @@ command setdiscordid => {
 	acl => q(bot_setdiscordid)
 }, class extends NDIRC::Command {
 	method execute ($c,$msg) {
-		my ($nick,$discordid) = $msg =~ /^(\S+) (\S+)$/ or die 'ARGS';
+		my ($nick,$discordid) = $msg =~ /^(\S+) (.+#\d+)$/ or die 'ARGS';
 		my $dbh = $c->model;
 
 		my $f = $dbh->prepare(q{SELECT uid,username FROM users WHERE username ILIKE ?});