From d6f241751302a2a2b7a022b7d5ea7c21940c1236 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 16 Aug 2018 03:34:59 +0200 Subject: [PATCH 1/8] Added Discontinued dates for several dozen lists And did some other stuff too. --- data/FilterList.json | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 7adc5b753..5636ee6ae 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -63,7 +63,7 @@ "chatUrl": null, "description": "Hosts file blocking known malware, spyware, virus, and shock sites", "descriptionSourceUrl": "https://github.com/michaeltrimm/hosts-blocking", - "discontinuedDate": null, + "discontinuedDate": "2016-12-29T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -531,7 +531,7 @@ "description": "The Quiet list blocks all other notices regardless of their size or obnoxiousness. Simple two- or three-word links to privacy pages aren't blocked (such as links in a page footer), but a lengthy paragraph mid-page will be.", "descriptionSourceUrl": "https://github.com/liamja/Prebake", - "discontinuedDate": null, + "discontinuedDate": "2018-05-28T00:00:00", "donateUrl": null, "emailAddress": "cookies@prebake.eu", "forumUrl": null, @@ -551,7 +551,7 @@ "description": "Prebake is an Adblock filter subscription that blocks large, obtrusive cookie notices. These notices either consume a considerable amount of screen real estate or popup and distract the viewers attention, which can be just as annoying as ads.", "descriptionSourceUrl": "http://prebake.eu/", - "discontinuedDate": null, + "discontinuedDate": "2018-05-28T00:00:00", "donateUrl": null, "emailAddress": "cookies@prebake.eu", "forumUrl": null, @@ -591,7 +591,7 @@ "description": "Contains a list of elements of advertising, such as banners or flash animations, the most commonly used on Polish websites.", "descriptionSourceUrl": "http://niecko.pl/adblock/", - "discontinuedDate": null, + "discontinuedDate": "2011-12-10T22:15:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -1228,7 +1228,7 @@ "chatUrl": null, "description": "A list combining Malware Domain List and Spybot.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2016-09-17T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -1247,7 +1247,7 @@ "chatUrl": null, "description": "A list combining Malware Domain List, Peter Lowe's List, Spybot, and Spyware Blaster.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2016-09-17T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -1902,7 +1902,7 @@ "chatUrl": null, "description": "Finnish supplement list for EasyList.", "descriptionSourceUrl": "https://raw.githubusercontent.com/wiltteri/subscriptions/master/wiltteri-reborn.txt", - "discontinuedDate": null, + "discontinuedDate": "2015-05-16T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -1921,7 +1921,7 @@ "chatUrl": null, "description": "Finnish supplement list for EasyList.", "descriptionSourceUrl": "https://raw.githubusercontent.com/wiltteri/subscriptions/master/wiltteri.txt", - "discontinuedDate": null, + "discontinuedDate": "2015-05-16T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -2170,7 +2170,7 @@ "chatUrl": null, "description": "Blocks advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2015-04-11T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -3405,10 +3405,10 @@ "id": 178, "chatUrl": null, "description": - "This is a list for blocking advertisements on banki.ru site which is not blocked by \"conventional\" list.", + "This is a list for blocking advertisements on the banki.ru site that are not blocked by \"conventional\" lists.", "descriptionSourceUrl": "https://raw.githubusercontent.com/rebelion76/bankiru_plus_adblock_list/master/bankiru_plus.txt", - "discontinuedDate": null, + "discontinuedDate": "2016-03-26T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -3432,7 +3432,7 @@ "donateUrl": null, "emailAddress": null, "forumUrl": null, - "homeUrl": "http://www.hostsfile.org/hosts.html", + "homeUrl": "https://www.hostsfile.org/hosts.html", "issuesUrl": null, "licenseId": 5, "name": "BadHosts", @@ -4132,7 +4132,7 @@ "chatUrl": null, "description": "Adblock PL is official Poland filter list for AdBlock and Adblock Plus.", "descriptionSourceUrl": "https://github.com/adblockpolska/Adblock_PL_List", - "discontinuedDate": null, + "discontinuedDate": "2014-11-07T00:00:00", "donateUrl": null, "emailAddress": "adblockpolska@gmail.com", "forumUrl": null, @@ -4210,7 +4210,7 @@ "chatUrl": null, "description": "Prevention behavior tracking by the site administrator.", "descriptionSourceUrl": "http://blogram.net/2010/04/23/adblock/", - "discontinuedDate": null, + "discontinuedDate": "2014-11-19T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -4421,7 +4421,7 @@ "chatUrl": null, "description": "Block the DL itself of advertising.", "descriptionSourceUrl": "http://blogram.net/2010/04/23/adblock/", - "discontinuedDate": null, + "discontinuedDate": "2014-12-13T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -4440,7 +4440,7 @@ "chatUrl": null, "description": "Hide text ads by CSS.", "descriptionSourceUrl": "http://blogram.net/2010/04/23/adblock/", - "discontinuedDate": null, + "discontinuedDate": "2015-01-10T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -4885,7 +4885,7 @@ "chatUrl": null, "description": "Blocks Vietnamese regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2017-02-19T00:00:00", "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW", "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, @@ -5695,7 +5695,7 @@ "chatUrl": null, "description": "Low spec for equipment extremists blocked.", "descriptionSourceUrl": "http://blogram.net/2010/04/23/adblock/", - "discontinuedDate": null, + "discontinuedDate": "2014-11-19T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -5733,7 +5733,7 @@ "chatUrl": null, "description": "Chinese supplement for the EasyList filters on IT sites.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2015-03-18T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -6191,7 +6191,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 2, - "viewUrl": "https://raw.githubusercontent.com/anudeepND/whitelist/master/whitelist.txt" + "viewUrl": "https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt" }, { "id": 322, @@ -6211,7 +6211,7 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 2, - "viewUrl": "https://raw.githubusercontent.com/anudeepND/whitelist/master/referral-sites.txt" + "viewUrl": "https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/referral-sites.txt" }, { "id": 323, @@ -6231,14 +6231,14 @@ "publishedDate": null, "submissionUrl": null, "syntaxId": 2, - "viewUrl": "https://raw.githubusercontent.com/anudeepND/whitelist/master/optional-list.txt" + "viewUrl": "https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt" }, { "id": 324, "chatUrl": null, "description": "A minimal adblocker for iOS.", "descriptionSourceUrl": "https://github.com/arcetera/Minimal-Hosts-Blocker", - "discontinuedDate": null, + "discontinuedDate": "2015-10-17T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -6414,7 +6414,7 @@ { "id": 333, "chatUrl": null, - "description": "Web list \"Leech\" for filtering out search results", + "description": "LeeCh's web list for filtering out search results for certain anime sites.", "descriptionSourceUrl": "https://github.com/pureexe/LeeCh-List/blob/master/README.md", "discontinuedDate": null, "donateUrl": null, @@ -6532,7 +6532,7 @@ "id": 339, "chatUrl": null, "description": - "Chinese hosts lists blocking sites like Gamil, Instagram, Wikipedia, Yahoo, Telegram(WEB), Dropbox, Flipboard, Mage, Line, Pinterest, W3schools, Ingress, Twitch, SoundCloud, Xboxlive, WordPress, Tapatalk, Kobo, Vimeo, Nytimes, Issuu, Tor, DuckDuckGo, Imgur, Pcbeta...", + "Hosts file to block ads on Chinese and some international sites.", "descriptionSourceUrl": null, "discontinuedDate": null, "donateUrl": null, @@ -6552,7 +6552,7 @@ "id": 340, "chatUrl": null, "description": - "Chinese hosts lists blocking sites like Google, Google Play, YouTube, Twitter, Facebook, Tumblr, Pixiv", + "Proxy redirector list intended for Chinese users, to access Gmail, Instagram, Wikipedia, Yahoo, Telegram(WEB), Dropbox, Flipboard, Mage, Line, Pinterest, W3schools, Ingress, Twitch, SoundCloud, Xboxlive, WordPress, Tapatalk, Kobo, Vimeo, Nytimes, Issuu, Tor, DuckDuckGo, Imgur, Pcbeta…", "descriptionSourceUrl": null, "discontinuedDate": null, "donateUrl": null, From f437e6f43ec948e645e0ec2291e2542571bfb65d Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 16 Aug 2018 03:42:37 +0200 Subject: [PATCH 2/8] Added Discontinued dates, part 2 --- data/FilterList.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 5636ee6ae..4a4027a6d 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -2513,7 +2513,7 @@ "chatUrl": null, "description": "Blocks Russian regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2008-05-18T00:00:00", "donateUrl": null, "emailAddress": "denis-ovs@yandex.ru", "forumUrl": "https://forum.mozilla-russia.org/viewtopic.php?id=3679", @@ -2840,7 +2840,7 @@ "chatUrl": null, "description": "Blocks spammers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2015-07-23T13:30:00", "donateUrl": null, "emailAddress": "wstearns@pobox.com", "forumUrl": null, @@ -3467,7 +3467,7 @@ "chatUrl": null, "description": "A list for Adblock Plus, which is one of the most famous ad blocking softwares.", "descriptionSourceUrl": "https://osdn.net/projects/ayucat-list/", - "discontinuedDate": null, + "discontinuedDate": "2009-10-18T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, @@ -4498,7 +4498,7 @@ "chatUrl": null, "description": "Block Facebook objects on non-Facebook websites", "descriptionSourceUrl": "http://www.squirrelconspiracy.net/abp/facebook-privacy-list.txt", - "discontinuedDate": null, + "discontinuedDate": "2010-05-18T05:40:00", "donateUrl": null, "emailAddress": "fbprivacylist@squirrelconspiracy.net", "forumUrl": null, @@ -5327,7 +5327,7 @@ "chatUrl": null, "description": "Czech filters for Adblock Plus.", "descriptionSourceUrl": "http://adblock.dajbych.net/adblock.txt", - "discontinuedDate": null, + "discontinuedDate": "2014-08-16T00:00:00", "donateUrl": null, "emailAddress": null, "forumUrl": null, From a39161668ad4441812d7a4d17fd2ed70ba439cc4 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 16 Aug 2018 03:48:58 +0200 Subject: [PATCH 3/8] Added a licence for a new list I'm not sure what counts as "permissive for adaption", but I've set it to false. --- data/License.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/License.json b/data/License.json index 98b41d2a0..71fab0c29 100644 --- a/data/License.json +++ b/data/License.json @@ -145,5 +145,12 @@ "name": "OSINT", "permissiveAdaptation": true, "permissiveCommercial": true + }, + { + "id": 22, + "descriptionUrl": "https://raw.githubusercontent.com/googlehosts/hosts/master/LICENSE", + "name": "GoogleHosts", + "permissiveAdaptation": false, + "permissiveCommercial": false } -] \ No newline at end of file +] From f96cc34019ad7accca48a4679dd303d4d4835ba6 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 16 Aug 2018 03:55:08 +0200 Subject: [PATCH 4/8] Added 1 new list --- data/FilterList.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/FilterList.json b/data/FilterList.json index 4a4027a6d..5e2b234ba 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8323,5 +8323,25 @@ "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/StopAutoplayOnYouTube.txt" + }, + { + "id": 435, + "chatUrl": null, + "description": + "A proxy redirector list for Chinese users.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/googlehosts/hosts", + "issuesUrl": "https://github.com/googlehosts/hosts/issues", + "licenseId": 23, + "name": "Google Hosts", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/googlehosts/hosts/master/hosts-files/hosts" } ] From 35554334630f92d70975a5e9ba1f01ccc392edda Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 16 Aug 2018 03:56:37 +0200 Subject: [PATCH 5/8] Assigned "Google Hosts" to Chinese --- data/FilterListLanguage.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 453d7489b..b78920ae8 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -666,5 +666,9 @@ { "filterListID": 430, "languageId": 44 + }, + { + "filterListID": 435, + "languageId": 99 } -] \ No newline at end of file +] From df3e6240fd9cc1a364837e0c9b5546ba46b3cdf5 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 16 Aug 2018 04:42:58 +0200 Subject: [PATCH 6/8] Added Discontinued dates to regional Fanboy lists --- data/FilterList.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 5e2b234ba..b09ff446c 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -4924,7 +4924,7 @@ "chatUrl": null, "description": "Blocks Turkish regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2017-02-19T00:00:00", "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW", "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, @@ -4943,7 +4943,7 @@ "chatUrl": null, "description": "Blocks Swedish regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2017-02-19T00:00:00", "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW", "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, @@ -4962,7 +4962,7 @@ "chatUrl": null, "description": "Blocks Spanish and Portuguese regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2017-02-19T00:00:00", "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW", "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, @@ -5000,7 +5000,7 @@ "chatUrl": null, "description": "Blocks Polish regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2017-02-19T00:00:00", "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW", "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, @@ -5019,7 +5019,7 @@ "chatUrl": null, "description": "Blocks Korean regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2017-02-19T00:00:00", "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW", "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, @@ -5038,7 +5038,7 @@ "chatUrl": null, "description": "Blocks Japanese regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2017-02-19T00:00:00", "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW", "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, @@ -5057,7 +5057,7 @@ "chatUrl": null, "description": "Blocks Hebrew regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2013-08-19T00:00:00", "donateUrl": null, "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, @@ -5076,7 +5076,7 @@ "chatUrl": null, "description": "Blocks Indian regional advertisements and trackers.", "descriptionSourceUrl": null, - "discontinuedDate": null, + "discontinuedDate": "2017-02-19T00:00:00", "donateUrl": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WMGE9MAGGGMHW", "emailAddress": "fanboyadblock@googlegroups.com", "forumUrl": null, From 7fa13e82796a2851c63323502f77eaafc0c8197e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 16 Aug 2018 11:38:19 +0200 Subject: [PATCH 7/8] Edited 2 descriptions I suddenly woke up after a few hours of sleep and became concerned that the trigger-happy Chinese censors would've blocked access to almost any site that had the word "proxy" on it, incl. FilterLists.com. So I moderated the descriptions for the Chinese proxy lists a bit. --- data/FilterList.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index b09ff446c..873ca6617 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -6552,7 +6552,7 @@ "id": 340, "chatUrl": null, "description": - "Proxy redirector list intended for Chinese users, to access Gmail, Instagram, Wikipedia, Yahoo, Telegram(WEB), Dropbox, Flipboard, Mage, Line, Pinterest, W3schools, Ingress, Twitch, SoundCloud, Xboxlive, WordPress, Tapatalk, Kobo, Vimeo, Nytimes, Issuu, Tor, DuckDuckGo, Imgur, Pcbeta…", + "Redirector list intended for Chinese users, for Gmail, Instagram, Wikipedia, Yahoo, Telegram(WEB), Dropbox, Flipboard, Mage, Line, Pinterest, W3schools, Ingress, Twitch, SoundCloud, Xboxlive, WordPress, Tapatalk, Kobo, Vimeo, Nytimes, Issuu, Tor, DuckDuckGo, Imgur, Pcbeta…", "descriptionSourceUrl": null, "discontinuedDate": null, "donateUrl": null, @@ -8328,7 +8328,7 @@ "id": 435, "chatUrl": null, "description": - "A proxy redirector list for Chinese users.", + "A redirector list for Chinese users.", "descriptionSourceUrl": null, "discontinuedDate": null, "donateUrl": null, From 74555a9de90e3f31cc865ada315465c5c4d7de4b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 16 Aug 2018 12:59:52 +0200 Subject: [PATCH 8/8] Attempted to fix an incorrect licence ID --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 873ca6617..b7fff67fd 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8336,7 +8336,7 @@ "forumUrl": null, "homeUrl": "https://github.com/googlehosts/hosts", "issuesUrl": "https://github.com/googlehosts/hosts/issues", - "licenseId": 23, + "licenseId": 22, "name": "Google Hosts", "policyUrl": null, "publishedDate": null,