From ab94e2d515a8bc035f350deba230f80042469fc6 Mon Sep 17 00:00:00 2001
From: hawkeye116477 <hawkeye116477@gmail.com>
Date: Mon, 2 Nov 2020 22:03:44 +0100
Subject: [PATCH] Update Polish filterlists

---
 services/Directory/data/FilterList.json       | 41 ++++---------------
 .../Directory/data/FilterListMaintainer.json  |  4 ++
 services/Directory/data/FilterListTag.json    | 16 ++++++++
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/services/Directory/data/FilterList.json b/services/Directory/data/FilterList.json
index 7d567426b..bb2e481d6 100644
--- a/services/Directory/data/FilterList.json
+++ b/services/Directory/data/FilterList.json
@@ -2274,15 +2274,6 @@
     "licenseId": 9,
     "name": "Polish Social Filters - Supplement for uBlock & AdGuard"
   },
-  {
-    "chatUrl": "https://riot.im/app/#/room/!IPhdjtOfWxVbiddKOo:matrix.org?via=matrix.org",
-    "description": "Blocks banners (paypal, payu, bitcoin and patronite), charity banners, other forms of inclination to support on Polish sites.",
-    "homeUrl": "https://github.com/KonoromiHimaries/PolishSubFilters",
-    "id": 342,
-    "isDeleted": true,
-    "licenseId": 9,
-    "name": "Polish Anti-Donate Filters"
-  },
   {
     "description": "uBlock Origin & AdGuard supplement list for Polish GDPR-Cookies Filters.",
     "donateUrl": "https://patronite.pl/polskiefiltry",
@@ -2292,15 +2283,6 @@
     "licenseId": 9,
     "name": "Polish GDPR-Cookies Filters - Supplement for uBlock & AdGuard"
   },
-  {
-    "chatUrl": "https://riot.im/app/#/room/!IPhdjtOfWxVbiddKOo:matrix.org?via=matrix.org",
-    "description": "Blocks internal advertising, paid subscriptions, own stores on Polish sites.",
-    "homeUrl": "https://github.com/KonoromiHimaries/PolishSubFilters/",
-    "id": 344,
-    "isDeleted": true,
-    "licenseId": 9,
-    "name": "Polish Internal Filters"
-  },
   {
     "description": "AdGuard supplement list for Official Polish Filters for AdBlock, uBlock Origin & AdGuard",
     "donateUrl": "https://patronite.pl/polskiefiltry",
@@ -2340,7 +2322,7 @@
     "name": "VXVault"
   },
   {
-    "description": "Polish hosts file for blocking scams (without controversial pages => https://github.com/PolishFiltersTeam/KAD/issues/649).",
+    "description": "Polish hosts file for blocking scams. This list is currently same as KADhosts (both are now without controversies) and will reach EOL by the end of 2020, so it's recommended that you migrate to KADhosts.",
     "emailAddress": "polishjarvis@gmail.com",
     "homeUrl": "https://kadantiscam.netlify.com/",
     "id": 349,
@@ -3335,16 +3317,6 @@
     "licenseId": 4,
     "name": "EasyList (TPL)"
   },
-  {
-    "description": "Whitelist of section with promotion of fake science/news. More at: https://github.com/PolishFiltersTeam/KAD/issues/649.",
-    "emailAddress": "polishjarvis@gmail.com",
-    "homeUrl": "https://kadantiscam.netlify.com/",
-    "id": 508,
-    "issuesUrl": "https://github.com/PolishFiltersTeam/KAD/issues",
-    "licenseId": 8,
-    "name": "KAD - The Whitelist of the Controversial Pages",
-    "submissionUrl": "https://kadantiscam.netlify.com/#contact"
-  },
   {
     "description": "Filters for blocking all the clickbait that surrounds articles and tries to drag you into a never-ending binge.",
     "homeUrl": "https://github.com/endolith/clickbait",
@@ -4179,11 +4151,14 @@
     "name": "EasyList (Domains)"
   },
   {
-    "emailAddress": "me@austinheap.com",
-    "homeUrl": "https://github.com/austinheap/sophos-xg-block-lists",
+    "description": "A Polish filters that protects against scams such as SMS subscriptions.",
+    "emailAddress": "polishjarvis@gmail.com",
+    "homeUrl": "https://kadantiscam.netlify.com/",
     "id": 703,
-    "licenseId": 2,
-    "name": "KAD Hosts File (Domains)"
+    "issuesUrl": "https://github.com/PolishFiltersTeam/KADhosts/issues",
+    "licenseId": 8,
+    "name": "KADomains",
+    "submissionUrl": "https://kadantiscam.netlify.com/#contact"
   },
   {
     "emailAddress": "me@austinheap.com",
diff --git a/services/Directory/data/FilterListMaintainer.json b/services/Directory/data/FilterListMaintainer.json
index d672e1d6c..49a67a7a0 100644
--- a/services/Directory/data/FilterListMaintainer.json
+++ b/services/Directory/data/FilterListMaintainer.json
@@ -1463,6 +1463,10 @@
     "filterListId": 686,
     "maintainerId": 82
   },
+  {
+    "filterListId": 703,
+    "maintainerId": 34
+  },
   {
     "filterListId": 729,
     "maintainerId": 134
diff --git a/services/Directory/data/FilterListTag.json b/services/Directory/data/FilterListTag.json
index 395ca08c6..a3fa5a307 100644
--- a/services/Directory/data/FilterListTag.json
+++ b/services/Directory/data/FilterListTag.json
@@ -199,10 +199,18 @@
     "filterListId": 59,
     "tagId": 2
   },
+  {
+    "filterListId": 60,
+    "tagId": 6
+  },
   {
     "filterListId": 60,
     "tagId": 7
   },
+  {
+    "filterListId": 61,
+    "tagId": 6
+  },
   {
     "filterListId": 61,
     "tagId": 7
@@ -3051,6 +3059,10 @@
     "filterListId": 703,
     "tagId": 6
   },
+  {
+    "filterListId": 703,
+    "tagId": 7
+  },
   {
     "filterListId": 704,
     "tagId": 2
@@ -8931,6 +8943,10 @@
     "filterListId": 1815,
     "tagId": 15
   },
+  {
+    "filterListId": 1816,
+    "tagId": 6
+  },
   {
     "filterListId": 1816,
     "tagId": 7