X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Commands%2FUsermgm.pm;h=5866f9144886ecd829b6b91874988a0148c9a2c0;hp=8dda53aaac5b3ac29c475a967a32b7ec397bf2f9;hb=8d103256e7f29d892d040ec25a38b2cb56e7f942;hpb=35603fe52927b3462494551898cf457d3062b2c0
diff --git a/Commands/Usermgm.pm b/Commands/Usermgm.pm
index 8dda53a..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("$username ($p_nick) already exists with host: $hostname");
+ $c->reply("$username ($p_nick, $discord_id) already exists with host: $hostname");
}else{
$dbh->do(q{
-INSERT INTO users (username,hostmask,pnick) VALUES($1,$2,$3)
- },undef,$nick,$host,$pnick);
- $c->reply("Added $nick(/$pnick) with host: $host");
+INSERT INTO users (username,hostmask,pnick,discord_id) VALUES($1,$2,$3,$4)
+ },undef,$nick,$host,$pnick,$discordid);
+ $c->reply("Added $nick(/$id)");
}
}
};