Merge branch 'master' of /u/webstump/live/

[modbot-mtm.git] / webstump / scripts / filter.lib.pl

diff --git a/webstump/scripts/filter.lib.pl b/webstump/scripts/filter.lib.pl
index 8aef45fe54112f53e4d590f157fe4b000849951d..965d816430f2b04f9b5b2707aff56df1ec3f622a 100644 (file)
--- a/webstump/scripts/filter.lib.pl
+++ b/webstump/scripts/filter.lib.pl
@@ -25,6 +25,7 @@ sub process_approval_decision {
                "Subject: $Subject\n" .
                 "Organization: http://www.algebra.com/~ichudov/stump\n";
 
+  $message .= "\n# $cathow\n";
   $message .= "\n$decision\n";
   $message .= "comment $comment\n" if $comment;
   &email_message( $message, $address );
@@ -44,6 +45,7 @@ print STDERR "DECISION: $newsgroup | $ShortDirectoryName | $decision | $cathow |
 # against the substrings as regexps and substrings as literal substrings.
 #
 # Arguments: address, listname
+
 sub name_is_in_list { # address, listname
   my $listName = pop( @_ );
   my $address = pop( @_ );
@@ -51,20 +53,23 @@ sub name_is_in_list { # address, listname
   my $item = "";
   my $Result = "";
 
-  $address = "\L$address";
-
   open( LIST, &full_config_file_name( $listName ) ) || return "";
 
   while( $item = <LIST> ) {
 
-    chop $item;
+    chomp $item;
 
-    next if $item =~ /^\s*$/;
+    next unless $item =~ /\S/;
+    next if $item =~ /^\s*\#/;
 
-    my $quoted_item = quotemeta( $item );
-
-    if( eval { $address =~ /$item/i; } || $address =~ /$quoted_item/i ) {
-      $Result = $item;
+    if ($listName eq 'good.posters.list') {
+       if( lc $address eq lc $item ) {
+           $Result = $item;
+       }
+    } else {
+       if( eval { $address =~ /$item/i; } ) {
+           $Result = $item;
+       }
     }
   }
 
@@ -73,7 +78,6 @@ sub name_is_in_list { # address, listname
   return $Result;
 }
 
-
 ######################################################################
 # reviews incoming message and decides: approve, reject, keep
 # in queue for human review
@@ -90,7 +94,7 @@ sub review_incoming_message { # Newsgroup, From, Subject, RealSubject, Message,
   my $newsgroup = pop( @_ );
 
   if( &name_is_in_list( $from, "bad.posters.list" ) ) {
-    &process_approval_decision( $subject, $newsgroup, $dir, "reject abuse", "", "auto bad poster" );
+    &process_approval_decision( $subject, $newsgroup, $dir, "reject blocklist", "", "auto bad poster" );
     return;
   }