From 205bc87047a847585e232d7e2988880cb67a9c20 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 23 Aug 2018 23:36:55 +0200 Subject: [PATCH 1/9] Assigned various tags to lists --- data/FilterListTag.json | 176 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 174 insertions(+), 2 deletions(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 07cdec084..b7bb7c1d3 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -3,6 +3,18 @@ "filterListId": 19, "tagId": 1 }, + { + "filterListId": 70, + "tagId": 8 + }, + { + "filterListId": 71, + "tagId": 8 + }, + { + "filterListId": 83, + "tagId": 5 + }, { "filterListId": 94, "tagId": 10 @@ -23,6 +35,62 @@ "filterListId": 145, "tagId": 10 }, + { + "filterListId": 151, + "tagId": 10 + }, + { + "filterListId": 153, + "tagId": 4 + }, + { + "filterListId": 155, + "tagId": 10 + }, + { + "filterListId": 159, + "tagId": 4 + }, + { + "filterListId": 175, + "tagId": 8 + }, + { + "filterListId": 184, + "tagId": 4 + }, + { + "filterListId": 207, + "tagId": 5 + }, + { + "filterListId": 214, + "tagId": 5 + }, + { + "filterListId": 223, + "tagId": 4 + }, + { + "filterListId": 224, + "tagId": 4 + }, + { + "filterListId": 225, + "tagId": 4 + }, + { + "filterListId": 226, + "tagId": 4 + }, + { + "filterListId": 227, + "tagId": 10 + }, + { + "filterListId": 229, + "tagId": 4 + }, { "filterListId": 238, "tagId": 10 @@ -31,18 +99,90 @@ "filterListId": 270, "tagId": 14 }, + { + "filterListId": 285, + "tagId": 14 + }, + { + "filterListId": 286, + "tagId": 14 + }, + { + "filterListId": 303, + "tagId": 14 + }, + { + "filterListId": 308, + "tagId": 1 + }, + { + "filterListId": 318, + "tagId": 1 + }, + { + "filterListId": 327, + "tagId": 9 + }, { "filterListId": 333, "tagId": 13 }, { - "filterListId": 339, + "filterListId": 340, "tagId": 12 }, + { + "filterListId": 343, + "tagId": 8 + }, + { + "filterListId": 356, + "tagId": 9 + }, + { + "filterListId": 357, + "tagId": 1 + }, + { + "filterListId": 358, + "tagId": 1 + }, + { + "filterListId": 359, + "tagId": 1 + }, + { + "filterListId": 360, + "tagId": 1 + }, + { + "filterListId": 361, + "tagId": 1 + }, + { + "filterListId": 362, + "tagId": 1 + }, + { + "filterListId": 363, + "tagId": 1 + }, + { + "filterListId": 365, + "tagId": 4 + }, { "filterListId": 371, "tagId": 13 }, + { + "filterListId": 373, + "tagId": 4 + }, + { + "filterListId": 379, + "tagId": 4 + }, { "filterListId": 384, "tagId": 10 @@ -51,6 +191,10 @@ "filterListId": 389, "tagId": 13 }, + { + "filterListId": 402, + "tagId": 10 + }, { "filterListId": 422, "tagId": 13 @@ -58,5 +202,33 @@ { "filterListId": 435, "tagId": 12 + }, + { + "filterListId": 436, + "tagId": 9 + }, + { + "filterListId": 472, + "tagId": 4 + }, + { + "filterListId": 474, + "tagId": 4 + }, + { + "filterListId": 500, + "tagId": 4 + }, + { + "filterListId": 501, + "tagId": 4 + }, + { + "filterListId": 502, + "tagId": 4 + }, + { + "filterListId": 503, + "tagId": 4 } -] \ No newline at end of file +] From bf3687e4a8d7993f86506eaa2cb0b6b751148e89 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 23 Aug 2018 23:47:33 +0200 Subject: [PATCH 2/9] Added 3 new lists and corrected 2 licences --- data/FilterList.json | 65 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index d674262b0..3c589785b 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8902,7 +8902,7 @@ "forumUrl": null, "homeUrl": "https://easylist.to", "issuesUrl": "easylist.polish@gmail.com", - "licenseId": 3, + "licenseId": 4, "name": "EasyList Polish", "policyUrl": null, "publishedDate": null, @@ -8926,7 +8926,7 @@ "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": 3, + "syntaxId": 4, "viewUrl": "https://github.com/yecarrillo/adblock-colombia/raw/master/adblock_co.txt" }, { @@ -9365,5 +9365,62 @@ "submissionUrl": null, "syntaxId": 1, "viewUrl": "https://adzhosts.eu/hosts/adzhosts-as-mac-linux.txt" - } -] \ No newline at end of file + }, + { + "id": 504, + "chatUrl": null, + "description": "This serves as a template and guidance for people who want to learn how to make their own adblock lists. This template contains the bare-bones necessities; the 'Novice' version has more tags and explanations.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Adblock List Template (Beginner)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Adblock%20list%20templates/Adblock%20list%20template%20-Beginner-.txt" + }, + { + "id": 505, + "chatUrl": null, + "description": "This serves as a template and guidance for people who want to learn how to make their own adblock lists. This template contains all conventionally used tags; the 'Beginner' version is easier to deal with.", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", + "emailAddress": "imreeil42@gmail.com", + "forumUrl": null, + "homeUrl": "https://github.com/DandelionSprout/adfilt", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 10, + "name": "Adblock List Template (Novice)", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Adblock%20list%20templates/Adblock%20list%20template%20-Novice-.txt" + }, + { + "id": 506, + "chatUrl": null, + "description": "Allow nonintrusive advertising without third-party tracking", + "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/exceptionrules-privacy-friendly.txt", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": "info@eyeo.com", + "forumUrl": null, + "homeUrl": "https://acceptableads.com/", + "issuesUrl": null, + "licenseId": 5, + "name": "Acceptable Ads", + "policyUrl": null, + "publishedDate": null, + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://easylist-downloads.adblockplus.org/exceptionrules-privacy-friendly.txt" + }, +] From 448aaaa5952b7bf3b52d424ffa2531cdb664be3b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 23 Aug 2018 23:48:00 +0200 Subject: [PATCH 3/9] Removed erreneous comma --- data/FilterList.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 3c589785b..93491897c 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -9422,5 +9422,5 @@ "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://easylist-downloads.adblockplus.org/exceptionrules-privacy-friendly.txt" - }, + } ] From 979fd3a479f966c6a4f695d40c2cb0b2c31e5325 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 23 Aug 2018 23:49:04 +0200 Subject: [PATCH 4/9] Added 1 tag to 1 new list --- data/FilterListTag.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index b7bb7c1d3..7d21e1e60 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -230,5 +230,9 @@ { "filterListId": 503, "tagId": 4 + }, + { + "filterListId": 506, + "tagId": 10 } ] From 6d647f8dae309e4efd9c1998b1d44e456160a919 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 24 Aug 2018 00:20:22 +0200 Subject: [PATCH 5/9] Added a new tag, part 1/2 --- data/FilterListTag.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 7d21e1e60..d87070681 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -1,8 +1,16 @@ [ + { + "filterListId": 5, + "tagId": 15 + }, { "filterListId": 19, "tagId": 1 }, + { + "filterListId": 38, + "tagId": 15 + }, { "filterListId": 70, "tagId": 8 @@ -111,6 +119,10 @@ "filterListId": 303, "tagId": 14 }, + { + "filterListId": 306, + "tagId": 15 + }, { "filterListId": 308, "tagId": 1 @@ -183,6 +195,10 @@ "filterListId": 379, "tagId": 4 }, + { + "filterListId": 381, + "tagId": 15 + }, { "filterListId": 384, "tagId": 10 @@ -191,14 +207,34 @@ "filterListId": 389, "tagId": 13 }, + { + "filterListId": 390, + "tagId": 15 + }, + { + "filterListId": 391, + "tagId": 15 + }, { "filterListId": 402, "tagId": 10 }, + { + "filterListId": 403, + "tagId": 15 + }, { "filterListId": 422, "tagId": 13 }, + { + "filterListId": 432, + "tagId": 15 + }, + { + "filterListId": 433, + "tagId": 15 + }, { "filterListId": 435, "tagId": 12 @@ -235,4 +271,8 @@ "filterListId": 506, "tagId": 10 } + { + "filterListId": , + "tagId": 15 + }, ] From dc3f5015a65e70860a407458152a389a6bd6720c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 24 Aug 2018 00:20:42 +0200 Subject: [PATCH 6/9] Removed template entry --- data/FilterListTag.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index d87070681..97b89ca47 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -271,8 +271,4 @@ "filterListId": 506, "tagId": 10 } - { - "filterListId": , - "tagId": 15 - }, ] From c8584715f10694a99a4feb2ee2e57d0530344f8f Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 24 Aug 2018 00:22:03 +0200 Subject: [PATCH 7/9] Added new tag, part 2/2 --- data/Tag.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/Tag.json b/data/Tag.json index 98f72ddea..f245146ec 100644 --- a/data/Tag.json +++ b/data/Tag.json @@ -68,5 +68,10 @@ "id": 14, "description": "Intended for research only", "name": "research" + }, + { + "id": 15, + "description": "Blocks specific topics/things", + "name": "topical" } -] \ No newline at end of file +] From 7af84a9320662947e930511a33e10fa54b1826ad Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 24 Aug 2018 00:23:18 +0200 Subject: [PATCH 8/9] Added another new tag, part 1/2 --- data/Tag.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/Tag.json b/data/Tag.json index f245146ec..ac0c32526 100644 --- a/data/Tag.json +++ b/data/Tag.json @@ -73,5 +73,10 @@ "id": 15, "description": "Blocks specific topics/things", "name": "topical" + }, + { + "id": 16, + "description": "Removes obstructing or annoying overlays", + "name": "overlay" } ] From a8b99289cc6e92f781bfdf9fee5a2750fa87bae1 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 24 Aug 2018 00:26:09 +0200 Subject: [PATCH 9/9] Added another new tag, part 2/2 --- data/FilterListTag.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 97b89ca47..9b33198d6 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -7,6 +7,10 @@ "filterListId": 19, "tagId": 1 }, + { + "filterListId": 33, + "tagId": 16 + }, { "filterListId": 38, "tagId": 15 @@ -135,6 +139,10 @@ "filterListId": 327, "tagId": 9 }, + { + "filterListId": 332, + "tagId": 16 + }, { "filterListId": 333, "tagId": 13 @@ -215,6 +223,10 @@ "filterListId": 391, "tagId": 15 }, + { + "filterListId": 392, + "tagId": 16 + }, { "filterListId": 402, "tagId": 10