watch is watch, autopull

Author: iBug

chatcommands.py

@@ -265,7 +265,7 @@ def do_blacklist(blacklist_type, msg, force=False):
         else:
             is_phone = False
 
-        is_watchlist = bool(blacklist_type == 'watch_keyword')
+        is_watchlist = bool("watch" in blacklist_type)
 
         concretized_pattern = pattern.replace("\\W", " ").replace("\\.", ".").replace("\\d", "8")
 

findspam.py

@@ -72,7 +72,7 @@
     r"""|(?:(?:[A-Za-z\u00a1-\uffff0-9]-?)*[A-Za-z\u00a1-\uffff0-9]+)(?:\.(?:[A-Za-z\u00a1-\uffff0-9]-?)"""
     r"""*[A-Za-z\u00a1-\uffff0-9]+)*(?:\.(?:[A-Za-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:/\S*)?""", regex.U)
 TAG_REGEX = regex.compile(r"</?[abcdehiklopsu][^>]+>|\w+://", regex.U)
-NUMBER_REGEX = regex.compile(r'\b[a-z_]*\+?(?:\d[\W_]*){8,13}\d(?=[a-z_]|\b)', regex.U)
+NUMBER_REGEX = regex.compile(r'\b[a-z_]*\+?(?:\d[\W_]*){8,13}\d(?=[a-z_]|\b)', regex.U | regex.I)
 
 UNIFORM = math.log(1 / 36)
 UNIFORM_PRIOR = math.log(1 / 5)

watched_numbers.txt

@@ -1,2 +1 @@
 1529098579	tripleee	+1 (808) 555-1212
-+1 (800) 666 9999