From a943d9df5178c88f3a26a71ab5c136f0e774d868 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 4 Sep 2018 12:20:28 +0200 Subject: [PATCH 1/8] Added 12 new lists --- data/FilterList.json | 141 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index a6df58d7f..fadd5874a 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -10809,5 +10809,142 @@ "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/abp-filters/abp-filters-anti-cv/master/turkish.txt" - } -] \ No newline at end of file + }, + { + "id": 589, + "description": "A occasionally updated collection gambling domains in hosts file format.", + "descriptionSourceUrl": "https://github.com/Sinfonietta/hostfiles", + "homeUrl": "https://github.com/Sinfonietta/hostfiles", + "issuesUrl": "https://github.com/Sinfonietta/hostfiles/issues", + "licenseId": 2, + "name": "Gambling Hosts", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/gambling-hosts" + }, + { + "id": 590, + "description": "A occasionally updated collection of porn domains in hosts file format.", + "descriptionSourceUrl": "https://github.com/Sinfonietta/hostfiles", + "homeUrl": "https://github.com/Sinfonietta/hostfiles", + "issuesUrl": "https://github.com/Sinfonietta/hostfiles/issues", + "licenseId": 2, + "name": "Pornography Hosts", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/pornography-hosts" + }, + { + "id": 591, + "description": "A occasionally updated collection of snuff domains in hosts file format.", + "homeUrl": "https://github.com/Sinfonietta/hostfiles", + "issuesUrl": "https://github.com/Sinfonietta/hostfiles/issues", + "licenseId": 2, + "name": "Snuff Hosts", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/snuff-hosts" + }, + { + "id": 592, + "description": "A occasionally updated collection of social media domains in hosts file format.", + "descriptionSourceUrl": "https://github.com/Sinfonietta/hostfiles", + "homeUrl": "https://github.com/Sinfonietta/hostfiles", + "issuesUrl": "https://github.com/Sinfonietta/hostfiles/issues", + "licenseId": 2, + "name": "Social Hosts", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/Sinfonietta/hostfiles/master/social-hosts" + }, + { + "id": 593, + "description": "This is a small attempt to limit my exposure to sites that fall under the umbrella of “fake news.” It blocks sites that willfully and regularly spread clickbait, hoaxes, propaganda and disinformation.", + "descriptionSourceUrl": "https://github.com/marktron/fakenews#purpose", + "emailAddress": "moustache@gmail.com", + "homeUrl": "https://github.com/marktron/fakenews", + "issuesUrl": "https://github.com/marktron/fakenews/issues", + "licenseId": 2, + "name": "fakenews", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/marktron/fakenews/master/fakenews" + }, + { + "id": 594, + "description": "Collection of Analytics, Ads, and tracking hosts to block.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/ads-and-tracking.txt", + "homeUrl": "https://github.com/lightswitch05/hosts", + "issuesUrl": "https://github.com/lightswitch05/hosts/issues", + "licenseId": 18, + "name": "Ads & Tracking", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/ads-and-tracking.txt" + }, + { + "id": 595, + "description": "Collection of Analytics, Ads, and tracking hosts to block.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/ads-and-tracking-extended.txt", + "homeUrl": "https://github.com/lightswitch05/hosts", + "issuesUrl": "https://github.com/lightswitch05/hosts/issues", + "licenseId": 18, + "name": "Ads & Tracking Extended", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/ads-and-tracking-extended.txt" + }, + { + "id": 596, + "description": "Collection of Analytics, Ads, and tracking hosts to block.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/tracking-aggressive.txt", + "homeUrl": "https://github.com/lightswitch05/hosts", + "issuesUrl": "https://github.com/lightswitch05/hosts/issues", + "licenseId": 18, + "name": "Tracking Aggressive", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/tracking-aggressive.txt" + }, + { + "id": 597, + "description": "Collection of Analytics, Ads, and tracking hosts to block.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/tracking-aggressive-extended.txt", + "homeUrl": "https://github.com/lightswitch05/hosts", + "issuesUrl": "https://github.com/lightswitch05/hosts/issues", + "licenseId": 18, + "name": "Tracking Aggressive Extended", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/lightswitch05/hosts/master/tracking-aggressive-extended.txt" + }, + { + "id": 598, + "description": "Hosts block ads of Vietnamese", + "descriptionSourceUrl": "https://github.com/bigdargon/hostsVN#hostsvn", + "homeUrl": "https://github.com/bigdargon/hostsVN", + "issuesUrl": "https://github.com/bigdargon/hostsVN/issues", + "licenseId": null, + "name": "hostsVN", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts" + }, + { + "id": 599, + "description": "Android host file - Adaway", + "descriptionSourceUrl": "https://abpvn.com/android/abpvn.txt", + "forumUrl": "http://www.vn-zoom.com/f77/abp-bo-loc-quang-cao-cho-nguoi-viet-2856275.html", + "emailAddress": "support@abpvn.com", + "homeUrl": "https://abpvn.com/", + "issuesUrl": "support@abpvn.com", + "licenseId": null, + "name": "ABPVN Hosts", + "syntaxId": 1, + "viewUrl": "https://abpvn.com/android/abpvn.txt" + }, + { + "id": 600, + "description": "The ABP advertising filter is built with the mission of improving the browsing experience for the Vietnamese users. ABPVN may not help block all ads, but ABPVN will minimize the appearance of ads on most websites in Vietnam.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn_noelemhide.txt", + "forumUrl": "http://www.vn-zoom.com/f77/abp-bo-loc-quang-cao-cho-nguoi-viet-2856275.html", + "emailAddress": "support@abpvn.com", + "homeUrl": "https://abpvn.com/", + "issuesUrl": "support@abpvn.com", + "licenseId": null, + "name": "ABPVN List - No Element Hide", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/abpvn/abpvn/master/filter/abpvn_noelemhide.txt" + } + ] +} From d4a47ee0020bb118b69fa5a730a933ac88253711 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 4 Sep 2018 12:23:15 +0200 Subject: [PATCH 2/8] Changed my Personal Blocklist list from "URLs" to "Domains" --- data/FilterList.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index fadd5874a..5d5dc21cc 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -7364,11 +7364,11 @@ "homeUrl": "https://github.com/DandelionSprout/adfilt", "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", "licenseId": 10, - "name": "Dandelion Sprout's list for Chrome Personal Blocklist", + "name": "Dandelion Sprout's list for Personal Blocklist", "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 8, + "syntaxId": 2, "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/List%20for%20Chrome%20Personal%20Blocklist" }, { From 4aeb14153a52d2cdb7c5e4f78bb69c3612e20930 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 4 Sep 2018 12:35:07 +0200 Subject: [PATCH 3/8] Added 3 software pieces --- data/Software.json | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/data/Software.json b/data/Software.json index 44d250c63..4a11c3401 100644 --- a/data/Software.json +++ b/data/Software.json @@ -88,5 +88,23 @@ "downloadUrl": "https://www.ublock.org/", "homeUrl": "https://www.ublock.org/", "name": "uBlock" + }, + { + "id": 16, + "downloadUrl": "https://support.microsoft.com/en-gb/help/18520/download-internet-explorer-11-offline-installer", + "homeUrl": "https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/platform-apis/hh273399(v=vs.85)", + "name": "Internet Explorer (TPL)" + }, + { + "id": 17, + "downloadUrl": "https://github.com/NanoAdblocker/NanoCore#nano-adblocker-core", + "homeUrl": "https://github.com/NanoAdblocker/NanoCore", + "name": "Nano Adblocker" + }, + { + "id": 18, + "downloadUrl": "https://greasyfork.org/scripts/1682-google-hit-hider-by-domain-search-filter-block-sites", + "homeUrl": "https://www.jeffersonscher.com/gm/google-hit-hider/", + "name": "Google Hit Hider by Domain" } -] \ No newline at end of file +] From 9e1815201eba94a5a50207fb85b844fe292237a5 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 4 Sep 2018 12:42:57 +0200 Subject: [PATCH 4/8] Attempted to assign more syntaxes to softwares --- data/SoftwareSyntax.json | 58 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/data/SoftwareSyntax.json b/data/SoftwareSyntax.json index 151aff4e7..8ad183366 100644 --- a/data/SoftwareSyntax.json +++ b/data/SoftwareSyntax.json @@ -1,4 +1,12 @@ [ + { + "softwareId": 1, + "syntaxId": 1 + }, + { + "softwareId": 5, + "syntaxId": 1 + }, { "softwareId": 7, "syntaxId": 1 @@ -11,6 +19,18 @@ "softwareId": 12, "syntaxId": 1 }, + { + "softwareId": 15, + "syntaxId": 1 + }, + { + "softwareId": 1, + "syntaxId": 2 + }, + { + "softwareId": 5, + "syntaxId": 2 + }, { "softwareId": 8, "syntaxId": 2 @@ -19,36 +39,72 @@ "softwareId": 9, "syntaxId": 2 }, + { + "softwareId": 15, + "syntaxId": 2 + }, + { + "softwareId": 17, + "syntaxId": 2 + }, { "softwareId": 2, "syntaxId": 3 }, + { + "softwareId": 3, + "syntaxId": 3 + }, { "softwareId": 4, "syntaxId": 3 }, + { + "softwareId": 5, + "syntaxId": 3 + }, { "softwareId": 6, "syntaxId": 3 }, + { + "softwareId": 15, + "syntaxId": 3 + }, { "softwareId": 1, "syntaxId": 4 }, + { + "softwareId": 3, + "syntaxId": 4 + }, { "softwareId": 5, "syntaxId": 4 }, + { + "softwareId": 1, + "syntaxId": 6 + }, { "softwareId": 3, "syntaxId": 6 }, + { + "softwareId": 16, + "syntaxId": 10 + }, { "softwareId": 10, "syntaxId": 11 }, + { + "softwareId": 5, + "syntaxId": 12 + }, { "softwareId": 13, "syntaxId": 13 } -] \ No newline at end of file +] From d9d7fd002a24a2753cf425f148fe872a9744442b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 4 Sep 2018 12:43:22 +0200 Subject: [PATCH 5/8] Didn't see that Nano had already been added --- data/Software.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/Software.json b/data/Software.json index 4a11c3401..a144e0ee3 100644 --- a/data/Software.json +++ b/data/Software.json @@ -97,12 +97,6 @@ }, { "id": 17, - "downloadUrl": "https://github.com/NanoAdblocker/NanoCore#nano-adblocker-core", - "homeUrl": "https://github.com/NanoAdblocker/NanoCore", - "name": "Nano Adblocker" - }, - { - "id": 18, "downloadUrl": "https://greasyfork.org/scripts/1682-google-hit-hider-by-domain-search-filter-block-sites", "homeUrl": "https://www.jeffersonscher.com/gm/google-hit-hider/", "name": "Google Hit Hider by Domain" From 27f66490723ef262864204c4fb92f6778d2538f8 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 4 Sep 2018 12:47:48 +0200 Subject: [PATCH 6/8] Fixed one mis-syntaxing --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 5d5dc21cc..53b6d4a28 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8926,7 +8926,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 4, + "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/yecarrillo/adblock-colombia/master/adblock_co.txt" }, { From 4739ecbbb56cb081550e2d55888e084597a48b69 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 4 Sep 2018 12:49:28 +0200 Subject: [PATCH 7/8] Assigned languages to 3 new lists --- data/FilterListLanguage.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index fc7c8b126..a4e2eb897 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -782,5 +782,17 @@ { "filterListId": 588, "languageId": 48 + }, + { + "filterListId": 598, + "languageId": 58 + }, + { + "filterListId": 599, + "languageId": 58 + }, + { + "filterListId": 600, + "languageId": 58 } -] \ No newline at end of file +] From 79082d2a8e417350158890ab7767e1f5795c6734 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Tue, 4 Sep 2018 12:53:03 +0200 Subject: [PATCH 8/8] Assigned tags to the new lists --- data/FilterListTag.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index f33f3fe11..1480a3f23 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -658,5 +658,33 @@ { "filterListId": 588, "tagId": 5 + }, + { + "filterListId": 589, + "tagId": 15 + }, + { + "filterListId": 590, + "tagId": 11 + }, + { + "filterListId": 591, + "tagId": 11 + }, + { + "filterListId": 592, + "tagId": 4 + }, + { + "filterListId": 593, + "tagId": 15 + }, + { + "filterListId": 596, + "tagId": 3 + }, + { + "filterListId": 597, + "tagId": 3 } ]