From dc83cf77462cc4715fd4e3cad9ed45d0d84602f7 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 28 Mar 2019 23:28:55 +0100 Subject: [PATCH] Late March pull 2 (#738) * Added 7 new colours * Changed the Vortex lists to "Domains with wildcards" * Added 13 new lists * Update FilterListTag.json * Update FilterListLanguage.json * Added some more lists * Corrected the TPL assistent link * Corrected various tags * Update FilterListMaintainer.json * Update FilterListTag.json * Hoping that uppercase letters resolves the problem * Added missing commas --- .github/README.md | 2 +- data/FilterList.json | 157 +++++++++++++++++- data/FilterListLanguage.json | 36 ++++ data/FilterListMaintainer.json | 48 ++++++ data/FilterListTag.json | 104 +++++++++++- data/TPLSubscriptionAssistant.html | 29 +++- .../modules/home/components/TagGroup.tsx | 11 +- 7 files changed, 364 insertions(+), 23 deletions(-) diff --git a/.github/README.md b/.github/README.md index b226e922a..96f0b9e69 100644 --- a/.github/README.md +++ b/.github/README.md @@ -46,4 +46,4 @@ We respect your privacy. That is the whole point of this site. The only minor da ### Internet Explorer TPL users -Due to problems with finding time to look into issues with TPL subscription buttons and to load the website in Internet Explorer, a makeshift archive has been set up in the meantime. To view a smaller TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/DandelionSprout/FilterLists/patch-74/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9. +Due to problems with finding time to look into issues with TPL subscription buttons and to load the website in Internet Explorer, a makeshift archive has been set up in the meantime. To view a smaller TPL-only archive with subscribable links, right-click on [this link](https://raw.githubusercontent.com/collinbarrett/FilterLists/master/data/TPLSubscriptionAssistant.html), choose to save it as an HTML file, and open it in Internet Explorer ≥9. diff --git a/data/FilterList.json b/data/FilterList.json index 0229f7725..6a2b96e52 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -15730,7 +15730,7 @@ "description": "Some optimized host files for Knox Adblockers.", "homeUrl": "https://github.com/Zykreh/vortexhosts", "name": "Vortex Hosts", - "syntaxId": 4, + "syntaxId": 16, "viewUrl": "https://raw.githubusercontent.com/Zykreh/vortexhosts/master/vortex.txt" }, { @@ -15738,7 +15738,7 @@ "description": "Some optimized host files for Knox Adblockers.", "homeUrl": "https://github.com/Zykreh/vortexhosts", "name": "Vortex Hosts Energized", - "syntaxId": 4, + "syntaxId": 16, "viewUrl": "https://raw.githubusercontent.com/Zykreh/vortexhosts/master/vortex_energized.txt" }, { @@ -15746,7 +15746,7 @@ "description": "Some optimized host files for Knox Adblockers.", "homeUrl": "https://github.com/Zykreh/vortexhosts", "name": "Vortex Hosts Experimental", - "syntaxId": 4, + "syntaxId": 16, "viewUrl": "https://raw.githubusercontent.com/Zykreh/vortexhosts/master/vortex_experimental.txt" }, { @@ -15754,7 +15754,7 @@ "description": "Some optimized host files for Knox Adblockers.", "homeUrl": "https://github.com/Zykreh/vortexhosts", "name": "Vortex Hosts Lite", - "syntaxId": 4, + "syntaxId": 16, "viewUrl": "https://raw.githubusercontent.com/Zykreh/vortexhosts/master/vortex_lite.txt" }, { @@ -16325,5 +16325,152 @@ "name": "SNAFU List", "syntaxId": 2, "viewUrl": "https://raw.githubusercontent.com/RooneyMcNibNug/pihole-stuff/master/SNAFU.txt" + }, + { + "id": 1537, + "description": "EasyPrivacy is an optional supplementary filter list that completely removes all forms of tracking from the internet, including web bugs, tracking scripts and information collectors, thereby protecting your personal data.", + "descriptionSourceUrl": "https://easylist.to/", + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "EasyPrivacy (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist.to/easylist/easyprivacy.tpl" + }, + { + "id": 1538, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "EasyList Without Element Hiding Rules (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist-downloads.adblockplus.org/easylist_noelemhide.tpl" + }, + { + "id": 1539, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "EasyTest (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist-downloads.adblockplus.org/easytest.tpl" + }, + { + "id": 1540, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "EasyList Polish (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist-downloads.adblockplus.org/easylistpolish.tpl" + }, + { + "id": 1541, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "Acceptable Ads (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist-downloads.adblockplus.org/exceptionrules.tpl" + }, + { + "id": 1542, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "Adware Filters (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist-downloads.adblockplus.org/adwarefilters.tpl" + }, + { + "id": 1543, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "KoreanList (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist-downloads.adblockplus.org/koreanlist.tpl" + }, + { + "id": 1544, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "EasyList Portuguese (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist-downloads.adblockplus.org/easylistportuguese.tpl" + }, + { + "id": 1545, + "description": "Finnish supplement list for EasyList.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/wiltteri/subscriptions/master/wiltteri.txt", + "homeUrl": "https://github.com/wiltteri/subscriptions", + "licenseId": 11, + "name": "Wiltteri (TPL)", + "publishedDate": "2015-04-25T19:15:33", + "syntaxId": 10, + "updatedDate": "2015-05-16T15:23:08", + "viewUrl": "https://raw.githubusercontent.com/wiltteri/subscriptions/master/wiltteri.tpl" + }, + { + "id": 1546, + "description": "Finnish supplement list for EasyList.", + "descriptionSourceUrl": "https://raw.githubusercontent.com/wiltteri/subscriptions/master/wiltteri.txt", + "homeUrl": "https://github.com/wiltteri/subscriptions", + "licenseId": 11, + "name": "Wiltteri Reborn (TPL)", + "publishedDate": "2015-04-25T19:15:33", + "syntaxId": 10, + "updatedDate": "2015-05-16T15:23:08", + "viewUrl": "https://raw.githubusercontent.com/wiltteri/subscriptions/master/wiltteri-reborn.tpl" + }, + { + "id": 1547, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "IndianList (TPL)", + "syntaxId": 10, + "viewUrl": "https://easylist-downloads.adblockplus.org/indianlist.tpl" + }, + { + "id": 1548, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "EasyList Spanish + EasyList", + "syntaxId": 3, + "viewUrl": "https://easylist-msie.adblockplus.org/easylistspanish+easylist.txt" + }, + { + "id": 1549, + "emailAddress": "easylist.subscription@gmail.com", + "forumUrl": "https://forums.lanik.us/", + "homeUrl": "https://easylist.to/", + "issuesUrl": "https://github.com/easylist/easylist/issues", + "licenseId": 4, + "name": "Wiltteri + EasyList", + "syntaxId": 3, + "viewUrl": "https://easylist-msie.adblockplus.org/wiltteri+easylist.txt" } -] \ No newline at end of file +] diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 85172c09a..92339fd77 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -2022,5 +2022,41 @@ { "filterListId": 1536, "languageId": 110 + }, + { + "filterListId": 1114, + "languageId": 10 + }, + { + "filterListId": 1540, + "languageId": 11 + }, + { + "filterListId": 1543, + "languageId": 154 + }, + { + "filterListId": 1544, + "languageId": 13 + }, + { + "filterListId": 1545, + "languageId": 139 + }, + { + "filterListId": 1546, + "languageId": 139 + }, + { + "filterListId": 1549, + "languageId": 139 + }, + { + "filterListId": 1547, + "languageId": 175 + }, + { + "filterListId": 1548, + "languageId": 79 } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 95c98ef74..f73465a2a 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -231,6 +231,54 @@ "filterListId": 1529, "maintainerId": 7 }, + { + "filterListId": 479, + "maintainerId": 7 + }, + { + "filterListId": 806, + "maintainerId": 7 + }, + { + "filterListId": 1537, + "maintainerId": 7 + }, + { + "filterListId": 1538, + "maintainerId": 7 + }, + { + "filterListId": 1529, + "maintainerId": 7 + }, + { + "filterListId": 1540, + "maintainerId": 7 + }, + { + "filterListId": 1541, + "maintainerId": 7 + }, + { + "filterListId": 1542, + "maintainerId": 7 + }, + { + "filterListId": 1543, + "maintainerId": 7 + }, + { + "filterListId": 1544, + "maintainerId": 7 + }, + { + "filterListId": 1548, + "maintainerId": 7 + }, + { + "filterListId": 1549, + "maintainerId": 7 + }, { "filterListId": 6, "maintainerId": 8 diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 0d3996e0d..2000d2998 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -195,6 +195,10 @@ "filterListId": 45, "tagId": 14 }, + { + "filterListId": 45, + "tagId": 24 + }, { "filterListId": 46, "tagId": 6 @@ -803,6 +807,10 @@ "filterListId": 168, "tagId": 3 }, + { + "filterListId": 169, + "tagId": 8 + }, { "filterListId": 169, "tagId": 9 @@ -1139,6 +1147,14 @@ "filterListId": 247, "tagId": 4 }, + { + "filterListId": 247, + "tagId": 8 + }, + { + "filterListId": 247, + "tagId": 9 + }, { "filterListId": 248, "tagId": 2 @@ -1895,6 +1911,10 @@ "filterListId": 405, "tagId": 9 }, + { + "filterListId": 405, + "tagId": 16 + }, { "filterListId": 410, "tagId": 1 @@ -2065,7 +2085,7 @@ }, { "filterListId": 450, - "tagId": 3 + "tagId": 26 }, { "filterListId": 451, @@ -5409,7 +5429,7 @@ }, { "filterListId": 1311, - "tagId": 11 + "tagId": 12 }, { "filterListId": 1312, @@ -5417,7 +5437,7 @@ }, { "filterListId": 1312, - "tagId": 11 + "tagId": 12 }, { "filterListId": 1313, @@ -5581,11 +5601,11 @@ }, { "filterListId": 1353, - "tagId": 15 + "tagId": 25 }, { "filterListId": 1354, - "tagId": 15 + "tagId": 25 }, { "filterListId": 1355, @@ -5965,7 +5985,7 @@ }, { "filterListId": 1450, - "tagId": 26 + "tagId": 15 }, { "filterListId": 1451, @@ -6490,5 +6510,77 @@ { "filterListId": 1536, "tagId": 3 + }, + { + "filterListId": 1537, + "tagId": 3 + }, + { + "filterListId": 1538, + "tagId": 2 + }, + { + "filterListId": 1539, + "tagId": 2 + }, + { + "filterListId": 1540, + "tagId": 2 + }, + { + "filterListId": 1541, + "tagId": 10 + }, + { + "filterListId": 1542, + "tagId": 2 + }, + { + "filterListId": 1543, + "tagId": 2 + }, + { + "filterListId": 1544, + "tagId": 2 + }, + { + "filterListId": 1545, + "tagId": 2 + }, + { + "filterListId": 1546, + "tagId": 2 + }, + { + "filterListId": 1547, + "tagId": 2 + }, + { + "filterListId": 1548, + "tagId": 2 + }, + { + "filterListId": 1549, + "tagId": 2 + }, + { + "filterListId": 1439, + "tagId": 15 + }, + { + "filterListId": 1160, + "tagId": 7 + }, + { + "filterListId": 1164, + "tagId": 7 + }, + { + "filterListId": 1128, + "tagId": 21 + }, + { + "filterListId": 1457, + "tagId": 7 } ] diff --git a/data/TPLSubscriptionAssistant.html b/data/TPLSubscriptionAssistant.html index 1ae997513..66a1ac75d 100644 --- a/data/TPLSubscriptionAssistant.html +++ b/data/TPLSubscriptionAssistant.html @@ -6,26 +6,33 @@ 3) Click on a link to subscribe to it.
3.5) Normally the link will be blocked the first time around. If so, click on "Allow Blocked Content" in the resulting prompt below, and then click the link again.

--------------------------------------------------

+-------------------------------------------------------

* International lists:

EasyList - View ruleset
+EasyList Without Element Hiding Rules - View ruleset
EasyList Without Rules for Adult Sites - View ruleset
EasyPrivacy - View ruleset
EasyPrivacy Without International Rules - View ruleset
EasyList + EasyPrivacy - View ruleset
-Peter Lowe's List - View ruleset
-DNS-BH Malware Domains - View ruleset
+Adware Filters - View ruleset
+EasyTest - View ruleset
+Acceptable Ads - View ruleset
Adblock Warning Removal List - View ruleset
-Fanboy's Social Blocking List - View ruleset
-Fanboy's Annoyance List - View ruleset

+Fanboy's Annoyance List - View ruleset
+Fanboy's Social Blocking List - View ruleset
+DNS-BH Malware Domains - View ruleset
+Peter Lowe's List - View ruleset

* Language-specific lists:

Bulgarian List + EasyList - View ruleset
+IndianList - View ruleset
+KoreanList - View ruleset
EasyList China + EasyList - View ruleset
EasyList China - View ruleset
-EasyList Czech and Slovak - View ruleset
+EasyList Czech and Slovak + EasyList - View ruleset
+EasyList Dutch + EasyList - View ruleset
EasyList Dutch - View ruleset
EasyList Germany + EasyList - View ruleset
EasyList Germany - View ruleset
@@ -34,6 +41,8 @@ EasyList Lithuania + EasyList - View ruleset
EasyList Spanish + EasyList - View ruleset
EasyList Spanish - View ruleset
+EasyList Polish - View ruleset
+EasyList Portuguese - View ruleset
EasyList Hebrew - View ruleset
Latvian List + EasyList - View ruleset
Liste AR + Liste FR + EasyList - View ruleset
@@ -44,11 +53,11 @@ RU AdList - View ruleset
Dandelion Sprouts nordiske filtre - View ruleset

--------------------------------------------------

+-------------------------------------------------------

* Outdated international lists (Last updated more than 24 months ago), that have not been succeeded by more recently updated TPL lists

-(2016) Fanboy's Enhanced Tracking List - View ruleset
+(2016) Fanboy's Enhanced Tracking List - View ruleset
(2016) Malware Patrol - View ruleset
(2016) Rickroll Blacklist - View ruleset
(2016) Prebake Obtrusive - View ruleset
@@ -63,4 +72,6 @@ * Outdated language-specific lists (Last updated more than 24 months ago), that have not been succeeded by more recently updated TPL lists

(2016) Adblock Persian List - View ruleset
-(2015) Wiltteri + EasyList - View ruleset

+(2015) Wiltteri - View ruleset
+(2015) Wiltteri + EasyList - View ruleset
+(2015) Wiltteri Reborn - View ruleset diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/TagGroup.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/TagGroup.tsx index e3341d29b..5f7a609da 100644 --- a/src/FilterLists.Web/ClientApp/modules/home/components/TagGroup.tsx +++ b/src/FilterLists.Web/ClientApp/modules/home/components/TagGroup.tsx @@ -56,5 +56,12 @@ const kelly_colors_hex = [ "F13A13", // Vivid Reddish Orange "232C16", // Dark Olive Green "000000", // Black - "FFFFFF" // White -]; \ No newline at end of file + "FFFFFF", // White + "C2F4BE", // Light Green + "1EDBB9", // Medium Greenish Blue + "890000", // Dark Red + "474747", // Dark Grey + "BFA125", // Matte Gold + "A7823C", // Dark Beige + "035A5C" // Dark Greenish Blue +];