From 9da45b371706a274d24201f1d87eaa5f433eb5e0 Mon Sep 17 00:00:00 2001
From: William Heimbigner <william.heimbigner@gmail.com>
Date: Wed, 13 Jan 2016 19:52:38 -0700
Subject: Get rid of string_blacklist related stuff.

---
 config-default/commands.xml |  3 ---
 lib/ASM/Classes.pm          | 14 --------------
 lib/ASM/Event.pm            |  3 ---
 meta.pl                     |  5 -----
 4 files changed, 25 deletions(-)

diff --git a/config-default/commands.xml b/config-default/commands.xml
index 299d599..527e1c1 100644
--- a/config-default/commands.xml
+++ b/config-default/commands.xml
@@ -572,9 +572,6 @@
   <command cmd="^;rehash$" flag="a">
   <![CDATA[
     ASM::XML->readXML();
-    my @strbl = io('string_blacklist.txt')->getlines;
-    chomp @strbl;
-    @::string_blacklist = @strbl;
     $conn->privmsg($event->replyto, 'config files were re-read');
   ]]>
   </command>
diff --git a/lib/ASM/Classes.pm b/lib/ASM/Classes.pm
index 17f6bdb..35ba5d0 100644
--- a/lib/ASM/Classes.pm
+++ b/lib/ASM/Classes.pm
@@ -14,7 +14,6 @@ sub new
   my $module = shift;
   my $self = {};
   my $tbl = {
-    "strbl" => \&strbl,
     "strblnew" => \&strblnew,
     "strblpcre" => \&strblpcre,
     "dnsbl" => \&dnsbl,
@@ -394,19 +393,6 @@ sub re {
   return 0;
 }
 
-sub strbl {
-  my ($chk, $id, $event, $chan) = @_;
-  my $match = lc $event->{args}->[0];
-  foreach my $line (@::string_blacklist) {
-    my $xline = lc $line;
-    my $idx = index $match, $xline;
-    if ( $idx != -1 ) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
 sub strblnew {
   my ($chk, $xid, $event, $chan) = @_;
   my $match = lc $event->{args}->[0];
diff --git a/lib/ASM/Event.pm b/lib/ASM/Event.pm
index 690a12d..2cd1e6c 100644
--- a/lib/ASM/Event.pm
+++ b/lib/ASM/Event.pm
@@ -136,9 +136,6 @@ sub on_pong
     } else {
       $conn->privmsg($::settings->{masterchan}, "Config files changed, auto rehash triggered. Check console for possible errors.");
       ASM::XML->readXML();
-      my @strbl = io('string_blacklist.txt')->getlines;
-      chomp @strbl;
-      @::string_blacklist = @strbl;
     }
   }
   if ($lag > 1) {
diff --git a/meta.pl b/meta.pl
index 50e0fbc..6ccddca 100755
--- a/meta.pl
+++ b/meta.pl
@@ -35,7 +35,6 @@ $Data::Dumper::Useqq=1;
 
 $::pass = '';
 @::nick_blacklist=();
-@::string_blacklist=();
 $::netsplit = 0;
 $::netsplit_ignore_lag = 0;
 $::no_autojoins = 0;
@@ -135,9 +134,6 @@ sub init {
   ASM::Event->new($conn, $::inspector);
   $::classes = ASM::Classes->new();
   $::fifo = ASM::Fifo->new($irc, $conn);
-  my @strbl = io('string_blacklist.txt')->getlines;
-  chomp @strbl;
-  @::string_blacklist = @strbl;
   my @nickbl = io('nick_blacklist.txt')->getlines;
   chomp @nickbl;
   @::nick_blacklist = @nickbl;
@@ -158,7 +154,6 @@ sub init {
   foreach my $file ("channels", "commands", "dnsbl", "mysql", "restrictions", "rules", "settings", "users", "blacklist") {
     $::fm->watch("./" . $::cset . '/' . $file . ".xml");
   }
-  $::fm->watch("string_blacklist.txt");
   $::fm->scan();
   $irc->start();
 }
-- 
cgit v1.2.3