From a87b46fda7418426c1a71903cfa0841b6bfb5e3c Mon Sep 17 00:00:00 2001 From: bogachenko Date: Thu, 14 Feb 2019 01:44:46 +1100 Subject: [PATCH] 404 Lists, again (#689) * Mother of All ADBLOCKING (Domains) * List-KR Unbreak * Magno's Adblock List (repo on github has been removed) * Malware URLs * Malware URLs Gray Area * Malware URLs Domains * say no commas * Update Fork.json --- data/FilterList.json | 64 +--------------------------------- data/FilterListLanguage.json | 4 --- data/FilterListMaintainer.json | 20 ----------- data/FilterListTag.json | 20 ----------- data/Fork.json | 8 ----- data/Maintainer.json | 6 ---- 6 files changed, 1 insertion(+), 121 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 51eb35437..f5d079d00 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -73,42 +73,6 @@ "viewUrlMirror1": "https://gitcdn.xyz/repo/mayve/private-adblock-filters/master/Adblock_List.txt", "viewUrlMirror2": "https://rawcdn.githack.com/mayve/private-adblock-filters/master/Adblock_List.txt" }, - { - "id": 7, - "description": "The Malware URLs in the 'gray area.' To be used by security researchers and anti-malware researchers. It can also be used by individuals to protect themselves. The 'gray area' is an area where many malware URLs exists, but there is also a big number of false positives as the gray area is the one where only 2 or 3 pieces of evidence were discovered. The 'gray area' should not be used for blocking domains or URLs, it is published only with the aim of helping malware researchers.", - "descriptionSourceUrl": "http://malwareurls.joxeankoret.com/", - "emailAddress": "info@joxeankoret.com", - "homeUrl": "http://malwareurls.joxeankoret.com/", - "licenseId": 2, - "name": "Malware URLs Gray Area", - "syntaxId": 3, - "updatedDate": "2015-07-30T00:00:00", - "viewUrl": "http://malwareurls.joxeankoret.com/grayarea.txt" - }, - { - "id": 8, - "description": "The domains of Malware URLs to be used by security researchers and anti-malware researchers. It can also be used by individuals to protect themselves.", - "descriptionSourceUrl": "http://malwareurls.joxeankoret.com/", - "emailAddress": "info@joxeankoret.com", - "homeUrl": "http://malwareurls.joxeankoret.com/", - "licenseId": 2, - "name": "Malware URLs Domains", - "syntaxId": 2, - "updatedDate": "2015-07-30T00:00:00", - "viewUrl": "http://malwareurls.joxeankoret.com/domains.txt" - }, - { - "id": 9, - "description": "A full set of Malware URLs to be used by security researchers and anti-malware researchers. It can also be used by individuals to protect themselves.", - "descriptionSourceUrl": "http://malwareurls.joxeankoret.com/", - "emailAddress": "info@joxeankoret.com", - "homeUrl": "http://malwareurls.joxeankoret.com/", - "licenseId": 2, - "name": "Malware URLs", - "syntaxId": 3, - "updatedDate": "2015-07-30T00:00:00", - "viewUrl": "http://malwareurls.joxeankoret.com/normal.txt" - }, { "id": 10, "description": "A hosts list of domains serving malware", @@ -165,20 +129,6 @@ "updatedDate": "2019-02-02T07:48:10", "viewUrl": "https://easylist-downloads.adblockplus.org/Liste_AR.txt" }, - { - "id": 15, - "description": "A filter list that fixes filtration errors in an alternative way due to limitations of adblockers other than AdGuard or those using Webkit content blocker API.", - "descriptionSourceUrl": "https://raw.githubusercontent.com/SlowMemory/List-KR/master/unbreak.txt", - "homeUrl": "https://list-kr.github.io/", - "issuesUrl": "https://github.com/SlowMemory/List-KR/issues", - "licenseId": 8, - "name": "List-KR Unbreak", - "submissionUrl": "https://list-kr.github.io/form.html", - "syntaxId": 6, - "viewUrl": "https://raw.githubusercontent.com/SlowMemory/List-KR/master/unbreak.txt", - "viewUrlMirror1": "https://gitcdn.xyz/repo/SlowMemory/List-KR/master/unbreak.txt", - "viewUrlMirror2": "https://rawcdn.githack.com/SlowMemory/List-KR/master/unbreak.txt" - }, { "id": 16, "description": "Filter that enables removing of ads, trackers, and various scripts from websites with Korean content.", @@ -8969,8 +8919,7 @@ "licenseId": 2, "name": "Magno's Adblock List", "syntaxId": 3, - "viewUrl": "https://raw.githubusercontent.com/magnobiet/adblock-plus-list/gh-pages/list.txt", - "viewUrlMirror1": "https://adp.magnobiet.com/list.txt" + "viewUrl": "https://adp.magnobiet.com/list.txt" }, { "id": 771, @@ -13465,17 +13414,6 @@ "updatedDate": "2018-05-28T14:02:55", "viewUrl": "https://raw.githubusercontent.com/deathbybandaid/piholeparser/master/Subscribable-Lists/ParsedBlacklists/Mitchell-Krogs-Badd-Boyz-Hosts.txt" }, - { - "id": 1177, - "homeUrl": "https://github.com/deathbybandaid/piholeparser", - "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", - "licenseId": 14, - "name": "Mother of All ADBLOCKING (Domains)", - "publishedDate": "2017-09-02T01:07:36", - "syntaxId": 2, - "updatedDate": "2018-12-21T00:38:29", - "viewUrl": "https://raw.githubusercontent.com/deathbybandaid/piholeparser/master/Subscribable-Lists/ParsedBlacklists/Mother-of-All-ADBLOCKING.txt" - }, { "id": 1179, "homeUrl": "https://github.com/deathbybandaid/piholeparser", diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 97f967c70..6ea17c81e 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -27,10 +27,6 @@ "filterListId": 14, "languageId": 122 }, - { - "filterListId": 15, - "languageId": 154 - }, { "filterListId": 16, "languageId": 154 diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index f50f4aafb..a8821f4ee 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -231,18 +231,6 @@ "filterListId": 6, "maintainerId": 8 }, - { - "filterListId": 7, - "maintainerId": 9 - }, - { - "filterListId": 8, - "maintainerId": 9 - }, - { - "filterListId": 9, - "maintainerId": 9 - }, { "filterListId": 10, "maintainerId": 10 @@ -483,10 +471,6 @@ "filterListId": 588, "maintainerId": 15 }, - { - "filterListId": 15, - "maintainerId": 18 - }, { "filterListId": 16, "maintainerId": 18 @@ -3539,10 +3523,6 @@ "filterListId": 1176, "maintainerId": 109 }, - { - "filterListId": 1177, - "maintainerId": 109 - }, { "filterListId": 1179, "maintainerId": 109 diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 90e29b892..04c543477 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -39,18 +39,6 @@ "filterListId": 6, "tagId": 3 }, - { - "filterListId": 7, - "tagId": 6 - }, - { - "filterListId": 8, - "tagId": 6 - }, - { - "filterListId": 9, - "tagId": 6 - }, { "filterListId": 10, "tagId": 6 @@ -71,10 +59,6 @@ "filterListId": 14, "tagId": 2 }, - { - "filterListId": 15, - "tagId": 10 - }, { "filterListId": 16, "tagId": 2 @@ -5223,10 +5207,6 @@ "filterListId": 1176, "tagId": 2 }, - { - "filterListId": 1177, - "tagId": 2 - }, { "filterListId": 1179, "tagId": 3 diff --git a/data/Fork.json b/data/Fork.json index 034483a97..e3263d689 100644 --- a/data/Fork.json +++ b/data/Fork.json @@ -1,12 +1,4 @@ [ - { - "forkFilterListId": 7, - "upstreamFilterListId": 9 - }, - { - "forkFilterListId": 8, - "upstreamFilterListId": 9 - }, { "forkFilterListId": 350, "upstreamFilterListId": 12 diff --git a/data/Maintainer.json b/data/Maintainer.json index c2395cec0..41e831d06 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -36,12 +36,6 @@ "homeUrl": "https://github.com/mayve", "name": "mayve" }, - { - "id": 9, - "emailAddress": "admin@oxeankoret.com", - "homeUrl": "http://joxeankoret.com/", - "name": "Joxean Koret" - }, { "id": 10, "homeUrl": "https://www.malwaredomainlist.com/",