X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FUsermgm.pm;h=5866f9144886ecd829b6b91874988a0148c9a2c0;hb=8d103256e7f29d892d040ec25a38b2cb56e7f942;hp=2b6176041287019a27c1c5af76e5a191612ba0bf;hpb=57134323940284d9e14e7a2860e5dae0a551c938;p=NDIRC.git

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 2b61760..5866f91 100644
--- a/Commands/Usermgm.pm
+++ b/Commands/Usermgm.pm
@@ -25,29 +25,36 @@ 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>");
 		}
 	}
 };
@@ -417,6 +424,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',