GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-22 11:59:43 +01:00
Code Issues Projects Releases Wiki Activity

Users: userset/userunset channel argument now optional

Browse Source
This commit is contained in:
Pragmatic Software 2020-01-28 23:14:17 -08:00
parent 539e599b61
commit 7dd486b0dc
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
PBot/Users.pm
View File

@ -312,7 +312,7 @@ sub logincmd {
my $channel_text = $user_channel eq '.*' ? '' : " for $user_channel"; my $channel_text = $user_channel eq '.*' ? '' : " for $user_channel";
if ($u->{loggedin}) { if ($u->{loggedin}) {
return "/msg $nick You are already logged into $u->{name} ($user_hostmask}$channel_text."; return "/msg $nick You are already logged into $u->{name} ($user_hostmask)$channel_text.";
} }
my $result = $self->login($user_channel, $user_hostmask, $arguments); my $result = $self->login($user_channel, $user_hostmask, $arguments);
@ -384,10 +384,11 @@ sub userdel {
sub userset { sub userset {
my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_; my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_;
$self->{pbot}->{interpreter}->unshift_arg($stuff->{arglist}, $from) if length $arguments and $stuff->{arglist}[0] !~ m/^#/;
my ($channel, $hostmask, $key, $value) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 4); my ($channel, $hostmask, $key, $value) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 4);
if (not defined $channel or not defined $hostmask) { if (not defined $hostmask) {
return "Usage: userset <channel> <hostmask or account name> [key] [value]"; return "Usage: userset [channel] <hostmask or account name> [key] [value]";
} }
my $admin = $self->find_admin($channel, "$nick!$user\@$host"); my $admin = $self->find_admin($channel, "$nick!$user\@$host");
@ -399,8 +400,11 @@ sub userset {
} }
if (not $target) { if (not $target) {
$channel = 'global' if $channel eq '.*'; if ($channel !~ /^#/) {
return "There is no user $hostmask in channel $channel."; return "There is no user account $hostmask.";
} else {
return "There is no user account $hostmask for $channel.";
}
} }
# don't allow non-bot-owners to add admins that can also add admins # don't allow non-bot-owners to add admins that can also add admins
@ -421,10 +425,11 @@ sub userset {
sub userunset { sub userunset {
my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_; my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_;
$self->{pbot}->{interpreter}->unshift_arg($stuff->{arglist}, $from) if length $arguments and $stuff->{arglist}[0] !~ m/^#/;
my ($channel, $hostmask, $key) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 3); my ($channel, $hostmask, $key) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 3);
if (not defined $channel or not defined $hostmask) { if (not defined $hostmask) {
return "Usage: userunset <channel> <hostmask or account name> <key>"; return "Usage: userunset [channel] <hostmask or account name> <key>";
} }
my $admin = $self->find_admin($channel, "$nick!$user\@$host"); my $admin = $self->find_admin($channel, "$nick!$user\@$host");
@ -436,8 +441,11 @@ sub userunset {
} }
if (not $target) { if (not $target) {
$channel = 'global' if $channel eq '.*'; if ($channel !~ /^#/) {
return "There is no user $hostmask in channel $channel."; return "There is no user account $hostmask.";
} else {
return "There is no user account $hostmask for $channel.";
}
} }
if ($target->{level} > $admin->{level}) { if ($target->{level} > $admin->{level}) {