Merge branch 'master' into auto-blacklist-1551673504

Charcoal-SE · Mar 4, 2019 · 0f02f7e · 0f02f7e
2 parents ba47bab + 597343b
commit 0f02f7e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/bad_keywords.txt b/bad_keywords.txt
@@ -1815,3 +1815,5 @@ alpha\W?hrd
 pods\W?vape
 idermabalm
 livewave\W*tv\W*antenna
+infatica
+king\W?servers
diff --git a/blacklisted_usernames.txt b/blacklisted_usernames.txt
@@ -124,3 +124,5 @@ hrisikesh\W*saloi?
 (?-i:^[a-z]+(?:dl?san|(?:dl|ld)l?son)(?<!donaldson)(?<!zhcdsan)(?<!ygoldson)$)
 (?-i:^shiv\W?guptag?$)
 muralidharaB
+^albertlee$
+^Biplab Mahanta‭$
diff --git a/blacklisted_websites.txt b/blacklisted_websites.txt
@@ -2641,3 +2641,6 @@ moneyonlineinvestment\.com
 careerjobs360\.in
 mumybear\.over-blog\.com
 supplement2trend\.com
+ello\.co
+ttlink\.com
+samuraipaper\.com
diff --git a/watched_keywords.txt b/watched_keywords.txt
@@ -7848,7 +7848,6 @@
 1548333738	tripleee	hatenablog\.com
 1548338654	tripleee	allitfeed\.com
 1548338517	Machavity	plumbwize\.ca
-1548344954	Asuna	infatica\.io
 1548347447	tripleee	faircom\.com
 1548385313	Tetsuya Yamamoto	likigram\.com
 1548391985	Sonic the Introverted Hedgehog	Homeocare International
@@ -8282,7 +8281,6 @@
 1550559959	Makyen	(?-i:WYuIl.png)(?#i.stack.imgur.com spam)
 1550560279	Shree	txbrewing\.com
 1550562157	Makyen	littlegreenman93(?:\W*(?:at\W*)?gmail\W*(?:dot\W*)?com)?
-1550562736	bertieb	samuraipaper\.com
 1550564390	Shree	marveledu\.com
 1550565192	Shree	pdfreaderpro\.com
 1550571433	Shree	tandemnz\.co\.nz
@@ -8513,4 +8511,12 @@
 1551614501	doppelgreener	digitalproguru\.com
 1551623676	Nisse Engström	dieseltester-cn\.com
 1551641284	Makyen	worldwidedonations\.com
-1551673504	FrankerZ	print\("SyntaxError: invalid syntax"\)\W*
+1551673504	FrankerZ	print\("SyntaxError: invalid syntax"\)\W*(?#used by a trol, circa 2019-03-03; see PR#2660)
+1551686878	Shree	patronageinstitute\.com
+1551691470	tripleee	turtlepac\.com
+1551692695	Shree	vidhya360\.in
+1551696020	Shree	locatebusiness\.net
+1551696846	tripleee	cognixia\.com
+1551696864	tripleee	pestongpestcontrol\.com
+1551701883	tripleee	munichmotorworks\.ae
+1551705682	tripleee	specsy
diff --git a/watched_numbers.txt b/watched_numbers.txt
@@ -241,3 +241,4 @@
 1551425809	Makyen	(301) 969 2020
 1551438851	Makyen	91-9510-860-860
 1551616543	tripleee	+380-98-704-2373
+1551695239	tripleee	0450200097