mirror of
https://github.com/pragma-/pbot.git
synced 2024-11-22 20:09:43 +01:00
Users: make any channel more any channel
This commit is contained in:
parent
94ee5f03a5
commit
6b6dfa9c53
@ -150,7 +150,7 @@ sub find_user_account {
|
||||
}
|
||||
|
||||
foreach my $chan (sort $sort keys %{ $self->{users}->{hash} }) {
|
||||
if (($channel !~ m/^#/ and $any_channel) or $channel =~ m/^$chan$/i) {
|
||||
if (($channel !~ m/^#/ and $any_channel) or $any_channel or $channel =~ m/^$chan$/i) {
|
||||
if (not exists $self->{users}->{hash}->{$chan}->{$hostmask}) {
|
||||
# find hostmask by account name or wildcard
|
||||
foreach my $mask (keys %{ $self->{users}->{hash}->{$chan} }) {
|
||||
@ -196,7 +196,7 @@ sub find_user {
|
||||
|
||||
my $user = eval {
|
||||
foreach my $channel_regex (sort $sort keys %{ $self->{users}->{hash} }) {
|
||||
if (($channel !~ m/^#/ and $any_channel) or $channel =~ m/^$channel_regex$/i) {
|
||||
if (($channel !~ m/^#/ and $any_channel) or $any_channel or $channel =~ m/^$channel_regex$/i) {
|
||||
foreach my $hostmask_regex (keys %{ $self->{users}->{hash}->{$channel_regex} }) {
|
||||
next if $hostmask_regex eq '_name';
|
||||
if ($hostmask_regex =~ m/[*?]/) {
|
||||
|
Loading…
Reference in New Issue
Block a user