From: Matthew Vernon <matthew@debian.org>
Date: Sun, 5 Jan 2014 13:28:25 +0000 (+0000)
Subject: Remove the blacklist of posters
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=commitdiff_plain;h=f74ee06e256c2470ad5ed264b090486856258b7f;p=modbot-ulm.git

Remove the blacklist of posters

The ULM mods want a watchlist for posters, not a blacklist. So remove
the blacklisted posters list, and replace the option to blacklist a
poster with the option to add them to the watch list.
---

diff --git a/webstump/doc/help/filter-lists.html b/webstump/doc/help/filter-lists.html
index fe7fad7..6a1199c 100644
--- a/webstump/doc/help/filter-lists.html
+++ b/webstump/doc/help/filter-lists.html
@@ -15,9 +15,6 @@ The algorithm for every incoming article is as follows:
 
 <OL>
 
-  <LI> Reject message if the author is listed in <A
-       HREF=##bad.posters.list>the List of Banned Posters.</A>.
-
   <LI> File message for human review if the author is listed in <A
        HREF=##watch.posters.list>the List of Untrusted Posters</A>.
 
diff --git a/webstump/scripts/filter.lib.pl b/webstump/scripts/filter.lib.pl
index b82a55a..891f7c9 100644
--- a/webstump/scripts/filter.lib.pl
+++ b/webstump/scripts/filter.lib.pl
@@ -92,11 +92,6 @@ sub review_incoming_message { # Newsgroup, From, Subject, RealSubject, Message,
   my $from = pop( @_ );
   my $newsgroup = pop( @_ );
 
-  if( &name_is_in_list( $from, "bad.posters.list" ) ) {
-    &process_approval_decision( $subject, $newsgroup, $dir, "reject blocklist", "", "auto bad poster" );
-    return;
-  }
-
   my $warning_file = &article_file_name( $dir ) . "/stump-warning.txt";
   my $match;
 
diff --git a/webstump/scripts/html_output.pl b/webstump/scripts/html_output.pl
index 505ff32..61f2b13 100644
--- a/webstump/scripts/html_output.pl
+++ b/webstump/scripts/html_output.pl
@@ -258,20 +258,18 @@ sub html_moderate_article {
 <INPUT TYPE=radio NAME=poster_decision VALUE=nothing CHECKED>Don't change poster's status</INPUT>
 <INPUT TYPE=radio NAME=poster_decision VALUE=preapprove 
 >White-list poster</INPUT>
-<INPUT TYPE=radio NAME=poster_decision VALUE=ban 
-  ONCLICK=\"alert( 'Banning a poster is a controversial practice'); \"
-> Ban All Posts by this Person (Careful!)</INPUT>
+<INPUT TYPE=radio NAME=poster_decision VALUE=suspicious>
+Add poster to watch list</INPUT>
 
 <BR><BR>
 <I>
-NOTE: Decisions to ban and whitelist posters can be reversed by 
-logging in as \"admin\" and editing respective lists of whitelisted
-and banned threads.
+NOTE: Decisions to watchlist and whitelist posters can be reversed by 
+editing the respective lists of whitelisted and watchlisted posters.
 ";
 
   &link_to_help( "filter-lists", "automatic filtering and filter lists, blacklisting and preapproved threads." );
 
-  print "Be really careful about blacklisting of everyone except spammers.</I><BR><BR>
+  print "</I><BR><BR>
 
 <INPUT TYPE=radio NAME=next_screen VALUE=single CHECKED> 
 	Review ONE article in next screen
@@ -755,7 +753,6 @@ sub html_newsgroup_management {
 
     <OPTION VALUE=good.posters.list>Good Posters List
     <OPTION VALUE=watch.posters.list>Suspicious Posters List
-    <OPTION VALUE=bad.posters.list>Banned Posters List
     <OPTION VALUE=watch.words.list>Suspicious Words List
 
   </SELECT>
diff --git a/webstump/scripts/webstump.lib.pl b/webstump/scripts/webstump.lib.pl
index 379cf06..45ff3d7 100644
--- a/webstump/scripts/webstump.lib.pl
+++ b/webstump/scripts/webstump.lib.pl
@@ -398,7 +398,6 @@ sub check_config_list {
  &user_error( "invalid list name $list_to_edit" )
     if( $list_to_edit ne "good.posters.list"
         && $list_to_edit ne "watch.posters.list"
-        && $list_to_edit ne "bad.posters.list"
         && $list_to_edit ne "watch.words.list" );
 
   return &untaint( $list_to_edit );