Merge branch 'master' into auto-blacklist-1515771310.2307668

bad_keywords.txt

@@ -1070,3 +1070,5 @@ php\W?training\W?in\W?chennai
 radiancy\W?serum
 thrustuline\W?boost
 viritenz
+luxe\W?revival
+cur\W?q\W?flex

blacklisted_websites.txt

@@ -1695,3 +1695,4 @@ bestonlineessaywritingservices\.com
 okean\.cc
 pro-papers\.com
 paperio\.org
+deskmoz\.com

findspam.py

@@ -437,10 +437,10 @@ def is_offensive_post(s, site, *args):
         return False, ""
 
     offensive = regex.compile(r"(?is)\b(ur mom|(yo)?u suck|8={3,}D|nigg[aeu][rh]?|(ass ?|a|a-)hole|fag(got)?|"
-                              r"daf[au][qk]|(?<!brain)(mother|mutha)?fuc?k+(a|ing?|e?(r|d)| off+| y(ou|e)(rself)?|"
-                              r" u+|tard)?|shit(t?er|head)?|you scum|dickhead|pedo|whore|cunt|cocksucker|ejaculated?|"
-                              r"jerk off|cummies|butthurt|queef|(private|pussy) show|lesbo|"
-                              r"bitche?s?|(eat|suck)\b.{0,20}\b dick|dee[sz]e? nut[sz])s?\b")
+                              r"daf[au][qk]|(?<!brain)(mother|mutha)?fuc?k+(a|ing?|e?[rd]| off+| y(ou|e)(rself)?|"
+                              r" u+|tard)?|(bull?)?shit(t?er|head)?|(yo)?u scum|dickhead|pedo|cocksuck(e?[rd])?|"
+                              r"whore|cunt|ejaculated?|jerk off|cummies|butthurt|queef|(private|pussy) show|lesbo|"
+                              r"bitche?|(eat|suck)\b.{0,20}\b dick|dee[sz]e? nut[sz])s?\b")
     matches = offensive.finditer(s)
     len_of_match = 0
     text_matched = []

watched_keywords.txt

@@ -1688,7 +1688,6 @@
 1511549812	Glorfindel	connectbroadbandchandigarh\.in
 1511558182	tripleee	(?:1\W*)?661\W*533\W*3371
 1511561311	Glorfindel	liondomino
-1511588499	Nisse Engström	deskmoz\.com
 1511600925	Glorfindel	savethelive\.com
 1511601088	Glorfindel	innervisiontechnology\.com
 1511603586	Glorfindel	graphicsbutter\.com
@@ -2192,3 +2191,8 @@
 1515752388	doppelgreener	manjeeramonarch\.com
 1515768333	Glorfindel	freebiebitcoin\.com
 1515771310	CalvT븃	segwitchecker\.com
+1515803538	Tetsuya Yamamoto	markscarpetcleaning\.com\.au
+1515832663	Glorfindel	perfectadhesives\.com
+1515836938	Glorfindel	bhiwadipolymers\.com
+1515840976	Suraj Rao	gteches\.com
+1515853609	iBug	honeyadvertising\.in