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

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 8dda53a..e530b84 100644
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -25,35 +25,42 @@ use MooseX::Declare;
 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),
+	help => q(syntax: .+user username id | username must be alphanum characters, assumes discord id if it ends with #XXXX otherwise pnick),
 	type => q(usermgmt),
 	acl => 'irc_adduser'
 }, class extends NDIRC::Command {
 	method execute ($c,$msg) {
-		my ($nick,$pnick) = $msg =~ /^(\w+)(?: ([^.\s]+))?$/ or die 'ARGS';
-		$pnick //= $nick;
+		my ($nick,$id) = $msg =~ /^(\w+) (.+)$/ or die 'ARGS';
 
 		my $dbh = $c->model;
-
-		my $host = "$pnick.users.netgamers.org";
-		my ($username,$hostname,$p_nick) = $dbh->selectrow_array(q{
-SELECT username, hostmask,pnick
-FROM users WHERE username = $1 OR hostmask = $2 OR pnick = $3
-			},undef,$nick,$host,$pnick);
+		my $pnick = undef;
+		my $discordid = undef;
+		my $host = undef;
+
+		if ($id =~ /.+#\d+/) {
+			$discordid = $id;
+		} else {
+			$pnick = $id;
+			$host = "$pnick.users.netgamers.org";
+		}
+		my ($username,$hostname,$p_nick,$discord_id) = $dbh->selectrow_array(q{
+SELECT username, hostmask,pnick,discord_id
+FROM users WHERE username = $1 OR hostmask = $2 OR pnick = $3 OR discord_id = $4
+			},undef,$nick,$host,$pnick,$discordid);
 
 		if (defined $username){
-			$c->reply("<b>$username ($p_nick)</b> already exists with host: <b>$hostname</b>");
+			$c->reply("<b>$username ($p_nick, $discord_id)</b> already exists with host: <b>$hostname</b>");
 		}else{
 			$dbh->do(q{
-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>");
+INSERT INTO users (username,hostmask,pnick,discord_id) VALUES($1,$2,$3,$4)
+				},undef,$nick,$host,$pnick,$discordid);
+			$c->reply("Added <b>$nick(/$id)</b>");
 		}
 	}
 };
 
 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 {
@@ -67,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;
@@ -152,16 +159,16 @@ command whois => {
 
 
 		my $f = $dbh->prepare(q{
-SELECT username, pnick, hostmask, array_to_string(array_agg(gid),'') AS flags
+SELECT username, pnick, hostmask, discord_id, array_to_string(array_agg(gid),'') AS flags
 FROM users u
 	LEFT OUTER JOIN (SELECT uid,gid FROM groupmembers ORDER BY uid,gid
 	) g USING (uid)
 WHERE username ILIKE ?
-GROUP BY username,pnick,hostmask LIMIT 5
+GROUP BY username,pnick,hostmask,discord_id LIMIT 5
 			});
 		$f->execute($nick);
 		while (my $user = $f->fetchrow_hashref){
-			$c->reply("<b>$user->{username} (/$user->{pnick})</b> flags: ($user->{flags}) host: $user->{hostmask}");
+			$c->reply("<b>$user->{username}</b> (<b>$user->{pnick},$user->{discord_id}</b>) flags: ($user->{flags}) host: $user->{hostmask}");
 		}
 		if ($f->rows == 0){
 			$c->reply("No hit, maybe spelling mistake, or add % as wildcard");