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

AntiSpam: rename channel to namespace; add $all_namespaces parameter

Browse Source
This commit is contained in:
Pragmatic Software 2018-08-06 11:01:23 -07:00
parent 5c3934781f
commit e0e4bfd59c
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
PBot/AntiSpam.pm
View File

@ -43,15 +43,15 @@ sub initialize {
} }
sub is_spam { sub is_spam {
my ($self, $channel, $text) = @_; my ($self, $namespace, $text, $all_namespaces) = @_;
return 0 if not $self->{pbot}->{registry}->get_value('antispam', 'enforce'); return 0 if not $self->{pbot}->{registry}->get_value('antispam', 'enforce');
return 0 if $self->{pbot}->{registry}->get_value($channel, 'dont_enforce_antispam'); return 0 if $self->{pbot}->{registry}->get_value($namespace, 'dont_enforce_antispam');
my $ret = eval { my $ret = eval {
foreach my $chan (keys %{ $self->{keywords}->hash }) { foreach my $space (keys %{ $self->{keywords}->hash }) {
next unless $channel =~ m/^$chan$/i; next unless not $all_namespaces and $namespace =~ m/^$space$/i;
foreach my $keyword (keys %{ $self->{keywords}->hash->{$chan} }) { foreach my $keyword (keys %{ $self->{keywords}->hash->{$space} }) {
return 1 if $text =~ m/$keyword/i; return 1 if $text =~ m/$keyword/i;
} }
} }
@ -78,9 +78,9 @@ sub antispam_cmd {
when ($_ eq "list" or $_ eq "show") { when ($_ eq "list" or $_ eq "show") {
my $text = "Spam keywords:\n"; my $text = "Spam keywords:\n";
my $entries = 0; my $entries = 0;
foreach my $channel (keys %{ $self->{keywords}->hash }) { foreach my $namespace (keys %{ $self->{keywords}->hash }) {
$text .= " $channel:\n"; $text .= " $namespace:\n";
foreach my $keyword (keys %{ $self->{keywords}->hash->{$channel} }) { foreach my $keyword (keys %{ $self->{keywords}->hash->{$namespace} }) {
$text .= " $keyword,\n"; $text .= " $keyword,\n";
$entries++; $entries++;
} }
@ -89,26 +89,26 @@ sub antispam_cmd {
return $text; return $text;
} }
when ("set") { when ("set") {
my ($channel, $keyword, $flag, $value) = split /\s+/, $args, 4; my ($namespace, $keyword, $flag, $value) = split /\s+/, $args, 4;
return "Usage: keywords set <channel> <keyword> [flag] [value]" if not defined $channel or not defined $keyword; return "Usage: keywords set <namespace> <keyword> [flag] [value]" if not defined $namespace or not defined $keyword;
if (not exists $self->{keywords}->hash->{$channel}) { if (not exists $self->{keywords}->hash->{$namespace}) {
return "There is no such channel `$channel` in the keywords."; return "There is no such namespace `$namespace` in the keywords.";
} }
if (not exists $self->{keywords}->hash->{$channel}->{$keyword}) { if (not exists $self->{keywords}->hash->{$namespace}->{$keyword}) {
return "There is no such keyword `$keyword` for channel `$channel` in the keywords."; return "There is no such keyword `$keyword` for namespace `$namespace` in the keywords.";
} }
if (not defined $flag) { if (not defined $flag) {
my $text = "Flags:\n"; my $text = "Flags:\n";
my $comma = ''; my $comma = '';
foreach $flag (keys %{ $self->{keywords}->hash->{$channel}->{$keyword} }) { foreach $flag (keys %{ $self->{keywords}->hash->{$namespace}->{$keyword} }) {
if ($flag eq 'created_on') { if ($flag eq 'created_on') {
my $timestamp = strftime "%a %b %e %H:%M:%S %Z %Y", localtime $self->{keywords}->hash->{$channel}->{$keyword}->{$flag}; my $timestamp = strftime "%a %b %e %H:%M:%S %Z %Y", localtime $self->{keywords}->hash->{$namespace}->{$keyword}->{$flag};
$text .= $comma . "created_on: $timestamp"; $text .= $comma . "created_on: $timestamp";
} else { } else {
$value = $self->{keywords}->hash->{$channel}->{$keyword}->{$flag}; $value = $self->{keywords}->hash->{$namespace}->{$keyword}->{$flag};
$text .= $comma . "$flag: $value"; $text .= $comma . "$flag: $value";
} }
$comma = ",\n "; $comma = ",\n ";
@ -117,7 +117,7 @@ sub antispam_cmd {
} }
if (not defined $value) { if (not defined $value) {
$value = $self->{keywords}->hash->{$channel}->{$keyword}->{$flag}; $value = $self->{keywords}->hash->{$namespace}->{$keyword}->{$flag};
if (not defined $value) { if (not defined $value) {
return "/say $flag is not set."; return "/say $flag is not set.";
} else { } else {
@ -125,52 +125,52 @@ sub antispam_cmd {
} }
} }
$self->{keywords}->hash->{$channel}->{$keyword}->{$flag} = $value; $self->{keywords}->hash->{$namespace}->{$keyword}->{$flag} = $value;
$self->{keywords}->save; $self->{keywords}->save;
return "Flag set."; return "Flag set.";
} }
when ("unset") { when ("unset") {
my ($channel, $keyword, $flag) = split /\s+/, $args, 3; my ($namespace, $keyword, $flag) = split /\s+/, $args, 3;
return "Usage: keywords unset <channel> <keyword> <flag>" if not defined $channel or not defined $keyword or not defined $flag; return "Usage: keywords unset <namespace> <keyword> <flag>" if not defined $namespace or not defined $keyword or not defined $flag;
if (not exists $self->{keywords}->hash->{$channel}) { if (not exists $self->{keywords}->hash->{$namespace}) {
return "There is no such channel `$channel` in the keywords."; return "There is no such namespace `$namespace` in the keywords.";
} }
if (not exists $self->{keywords}->hash->{$channel}->{$keyword}) { if (not exists $self->{keywords}->hash->{$namespace}->{$keyword}) {
return "There is no such keyword `$keyword` for channel `$channel` in the keywords."; return "There is no such keyword `$keyword` for namespace `$namespace` in the keywords.";
} }
if (not exists $self->{keywords}->hash->{$channel}->{$keyword}->{$flag}) { if (not exists $self->{keywords}->hash->{$namespace}->{$keyword}->{$flag}) {
return "There is no such flag `$flag` for keyword `$keyword` for channel `$channel` in the keywords."; return "There is no such flag `$flag` for keyword `$keyword` for namespace `$namespace` in the keywords.";
} }
delete $self->{keywords}->hash->{$channel}->{$keyword}->{$flag}; delete $self->{keywords}->hash->{$namespace}->{$keyword}->{$flag};
$self->{keywords}->save; $self->{keywords}->save;
return "Flag unset."; return "Flag unset.";
} }
when ("add") { when ("add") {
my ($channel, $keyword) = split /\s+/, $args, 2; my ($namespace, $keyword) = split /\s+/, $args, 2;
return "Usage: keywords add <channel> <keyword>" if not defined $channel or not defined $keyword; return "Usage: keywords add <namespace> <keyword>" if not defined $namespace or not defined $keyword;
$self->{keywords}->hash->{$channel}->{$keyword}->{owner} = "$nick!$user\@$host"; $self->{keywords}->hash->{$namespace}->{$keyword}->{owner} = "$nick!$user\@$host";
$self->{keywords}->hash->{$channel}->{$keyword}->{created_on} = gettimeofday; $self->{keywords}->hash->{$namespace}->{$keyword}->{created_on} = gettimeofday;
$self->{keywords}->save; $self->{keywords}->save;
return "/say Added."; return "/say Added.";
} }
when ("remove") { when ("remove") {
my ($channel, $keyword) = split /\s+/, $args, 2; my ($namespace, $keyword) = split /\s+/, $args, 2;
return "Usage: keywords remove <channel> <keyword>" if not defined $channel or not defined $keyword; return "Usage: keywords remove <namespace> <keyword>" if not defined $namespace or not defined $keyword;
if(not defined $self->{keywords}->hash->{$channel}) { if(not defined $self->{keywords}->hash->{$namespace}) {
return "No entries for channel $channel"; return "No entries for namespace $namespace";
} }
if(not defined $self->{keywords}->hash->{$channel}->{$keyword}) { if(not defined $self->{keywords}->hash->{$namespace}->{$keyword}) {
return "No such entry for channel $channel"; return "No such entry for namespace $namespace";
} }
delete $self->{keywords}->hash->{$channel}->{$keyword}; delete $self->{keywords}->hash->{$namespace}->{$keyword};
delete $self->{keywords}->hash->{$channel} if keys %{ $self->{keywords}->hash->{$channel} } == 0; delete $self->{keywords}->hash->{$namespace} if keys %{ $self->{keywords}->hash->{$namespace} } == 0;
$self->{keywords}->save; $self->{keywords}->save;
return "/say Removed."; return "/say Removed.";
} }