Updated .whois to show discord_id

[NDIRC.git] / Commands / Usermgm.pm

diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 8dda53aaac5b3ac29c475a967a32b7ec397bf2f9..7554fd4895acb11d9044f09487d7cd711505016f 100644 (file)
--- 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>");
                }
        }
 };
@@ -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");