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

BlackList now respects channel for $a: and $r:

Browse Source
This commit is contained in:
Pragmatic Software 2017-08-03 15:21:46 -07:00
parent 9bd80687b1
commit 68821bb0f8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PBot/BlackList.pm
View File

@ -147,13 +147,15 @@ sub check_blacklist {
$black_channel_escaped =~ s/\\(\.|\*)/$1/g; $black_channel_escaped =~ s/\\(\.|\*)/$1/g;
$black_hostmask_escaped =~ s/\\(\.|\*)/$1/g; $black_hostmask_escaped =~ s/\\(\.|\*)/$1/g;
next if $channel !~ /^$black_channel_escaped$/;
if ($flag eq 'a' && defined $nickserv && $nickserv =~ /$black_hostmask_escaped/i) { if ($flag eq 'a' && defined $nickserv && $nickserv =~ /$black_hostmask_escaped/i) {
$self->{pbot}->{logger}->log("$hostmask nickserv $nickserv blacklisted in channel $channel (matches [\$a:$black_hostmask] host and [$black_channel] channel)\n"); $self->{pbot}->{logger}->log("$hostmask nickserv $nickserv blacklisted in channel $channel (matches [\$a:$black_hostmask] host and [$black_channel] channel)\n");
return 1; return 1;
} elsif ($flag eq 'r' && defined $gecos && $gecos =~ /$black_hostmask_escaped/i) { } elsif ($flag eq 'r' && defined $gecos && $gecos =~ /$black_hostmask_escaped/i) {
$self->{pbot}->{logger}->log("$hostmask GECOS $gecos blacklisted in channel $channel (matches [\$r:$black_hostmask] host and [$black_channel] channel)\n"); $self->{pbot}->{logger}->log("$hostmask GECOS $gecos blacklisted in channel $channel (matches [\$r:$black_hostmask] host and [$black_channel] channel)\n");
return 1; return 1;
} elsif ($flag eq '' && $channel =~ /^$black_channel_escaped$/i && $hostmask =~ /$black_hostmask_escaped/i) { } elsif ($flag eq '' && $hostmask =~ /$black_hostmask_escaped/i) {
$self->{pbot}->{logger}->log("$hostmask blacklisted in channel $channel (matches [$black_hostmask] host and [$black_channel] channel)\n"); $self->{pbot}->{logger}->log("$hostmask blacklisted in channel $channel (matches [$black_hostmask] host and [$black_channel] channel)\n");
return 1; return 1;
} }