No longer consider the bad.subjects, bad.words, watch.posters,

watch.subjects, good.subjects lists.

This part of the process of simplifying the UI for the ulm mods.

diff --git a/webstump/scripts/filter.lib.pl b/webstump/scripts/filter.lib.pl
index 3a41cb5656d19a1a5e9cfa3f8736e9bb6db7cb41..d9e460e4de6b5d56d98b9796c75a76697d29d314 100644 (file)
--- a/webstump/scripts/filter.lib.pl
+++ b/webstump/scripts/filter.lib.pl
@@ -97,37 +97,11 @@ sub review_incoming_message { # Newsgroup, From, Subject, RealSubject, Message,
     return;
   }
 
-  if( &name_is_in_list( $real_subject, "bad.subjects.list" ) ) {
-    &process_approval_decision( $subject, $newsgroup, $dir, "reject thread", "", "auto bad subject" );
-    return;
-  }
-
-  if( &name_is_in_list( $message, "bad.words.list" ) ) {
-    &process_approval_decision( $subject, $newsgroup, $dir, "reject charter", 
-    "Your message has been autorejected because it appears to be off topic
-    based on our filtering criteria. Like everything, filters do not
-    always work perfectly and you can always appeal this decision.",
-                                "auto bad word" );
-    return;
-  }
-
   my $warning_file = &article_file_name( $dir ) . "/stump-warning.txt";
   my $match;
 
   $ignore_demo_mode = 1;
 
-  if( $match = &name_is_in_list( $from, "watch.posters.list" ) ) {
-    &append_to_file( $warning_file, "Warning: poster '$from' matches '$match' from the list of suspicious posters\n" );
-print STDERR "Filing Article for review because poster '$from' matches '$match'\n";
-    return; # file message
-  }
-
-  if( $match = &name_is_in_list( $real_subject, "watch.subjects.list" ) ) {
-    &append_to_file( $warning_file, "Warning: subject '$real_subject' matches '$match' from the list of suspicious subjects\n" );
-print STDERR "Filing Article for review because subject '$subject' matches '$match'\n";
-    return; # file message
-  }
-
   if( $match = &name_is_in_list( $message, "watch.words.list" ) ) {
     &append_to_file( $warning_file, "Warning: article matches '$match' from the list of suspicious words\n" );
 print STDERR "Filing Article for review because article matches '$match'\n";
@@ -140,12 +114,6 @@ print STDERR "Filing Article for review because article matches '$match'\n";
     return;
   }
 
-  if( &name_is_in_list( $real_subject, "good.subjects.list" ) ) {
-    &process_approval_decision( $subject, $newsgroup, $dir, "approve", "",
-                                "auto good subject" );
-    return;
-  }
-
   # if the message remains here, it is stored for human review.
 
 }