GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-01-23 10:34:52 +01:00
Code Issues Projects Releases Wiki Activity

BotAdmins: admin hostmasks can now be either regex (.*!.*@host) or wildcard (*!*@host)

Browse Source
This commit is contained in:
Pragmatic Software 2020-01-03 20:39:13 -08:00
parent be8ae88dcc
commit ac28b007d6
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PBot/BotAdmins.pm
View File

@ -39,6 +39,7 @@ sub add_admin {
my $self = shift; my $self = shift;
my ($name, $channel, $hostmask, $level, $password, $dont_save) = @_; my ($name, $channel, $hostmask, $level, $password, $dont_save) = @_;
$channel = lc $channel; $channel = lc $channel;
$channel = '.*' if $channel !~ m/^#/;
$hostmask = lc $hostmask; $hostmask = lc $hostmask;
$self->{admins}->hash->{$channel}->{$hostmask}->{name} = $name; $self->{admins}->hash->{$channel}->{$hostmask}->{name} = $name;
$self->{admins}->hash->{$channel}->{$hostmask}->{level} = $level; $self->{admins}->hash->{$channel}->{$hostmask}->{level} = $level;
@ -51,6 +52,10 @@ sub remove_admin {
my $self = shift; my $self = shift;
my ($channel, $hostmask) = @_; my ($channel, $hostmask) = @_;
$channel = lc $channel;
$hostmask = lc $hostmask;
$channel = '.*' if $channel !~ m/^#/;
my $admin = delete $self->{admins}->hash->{$channel}->{$hostmask}; my $admin = delete $self->{admins}->hash->{$channel}->{$hostmask};
if (not keys %{$self->{admins}->hash->{$channel}}) { if (not keys %{$self->{admins}->hash->{$channel}}) {
@ -115,7 +120,18 @@ sub find_admin {
foreach my $channel_regex (keys %{ $self->{admins}->hash }) { foreach my $channel_regex (keys %{ $self->{admins}->hash }) {
if ($from !~ m/^#/ or $from =~ m/^$channel_regex$/i) { if ($from !~ m/^#/ or $from =~ m/^$channel_regex$/i) {
foreach my $hostmask_regex (keys %{ $self->{admins}->hash->{$channel_regex} }) { foreach my $hostmask_regex (keys %{ $self->{admins}->hash->{$channel_regex} }) {
return $self->{admins}->hash->{$channel_regex}->{$hostmask_regex} if $hostmask =~ m/^$hostmask_regex$/i or $hostmask eq lc $hostmask_regex; if ($hostmask_regex =~ m/\.\*/) {
# contains .* so it's considered a regex
return $self->{admins}->hash->{$channel_regex}->{$hostmask_regex} if $hostmask =~ m/^$hostmask_regex$/i;
} elsif ($hostmask_regex =~ m/\*/) {
# contains * so it's converted to a regex
my $hostmask_quoted = quotemeta $hostmask_regex;
$hostmask_quoted =~ s/\\\*/.*/g;
return $self->{admins}->hash->{$channel_regex}->{$hostmask_regex} if $hostmask =~ m/^$hostmask_quoted$/i;
} else {
# direct comparison
return $self->{admins}->hash->{$channel_regex}->{$hostmask_regex} if $hostmask eq lc $hostmask_regex;
}
} }
} }
} }