From 8d0c02a463f6f81e5788b6e877f1ed5b901efe9a Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 8 Sep 2018 22:40:00 +0200 Subject: [PATCH 1/3] Added 127 new tags to lists --- data/FilterListTag.json | 528 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 526 insertions(+), 2 deletions(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 891c8005c..3e8163e03 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -1499,6 +1499,22 @@ "filterListId": 493, "tagId": 11 }, + { + "filterListId": 500, + "tagId": 4 + }, + { + "filterListId": 501, + "tagId": 4 + }, + { + "filterListId": 502, + "tagId": 4 + }, + { + "filterListId": 503, + "tagId": 4 + }, { "filterListId": 506, "tagId": 3 @@ -1822,5 +1838,513 @@ { "filterListId": 606, "tagId": 6 - } -] \ No newline at end of file + }, +{ + "filterListId": 410, + "tagId": 1 + }, + { + "filterListId": 12, + "tagId": 2 + }, + { + "filterListId": 14, + "tagId": 2 + }, + { + "filterListId": 39, + "tagId": 2 + }, + { + "filterListId": 49, + "tagId": 2 + }, + { + "filterListId": 54, + "tagId": 2 + }, + { + "filterListId": 59, + "tagId": 2 + }, + { + "filterListId": 66, + "tagId": 2 + }, + { + "filterListId": 78, + "tagId": 2 + }, + { + "filterListId": 79, + "tagId": 2 + }, + { + "filterListId": 80, + "tagId": 2 + }, + { + "filterListId": 81, + "tagId": 2 + }, + { + "filterListId": 85, + "tagId": 2 + }, + { + "filterListId": 93, + "tagId": 2 + }, + { + "filterListId": 95, + "tagId": 2 + }, + { + "filterListId": 96, + "tagId": 2 + }, + { + "filterListId": 100, + "tagId": 2 + }, + { + "filterListId": 101, + "tagId": 2 + }, + { + "filterListId": 104, + "tagId": 2 + }, + { + "filterListId": 105, + "tagId": 2 + }, + { + "filterListId": 106, + "tagId": 2 + }, + { + "filterListId": 107, + "tagId": 2 + }, + { + "filterListId": 108, + "tagId": 2 + }, + { + "filterListId": 109, + "tagId": 2 + }, + { + "filterListId": 110, + "tagId": 2 + }, + { + "filterListId": 111, + "tagId": 2 + }, + { + "filterListId": 112, + "tagId": 2 + }, + { + "filterListId": 116, + "tagId": 2 + }, + { + "filterListId": 118, + "tagId": 2 + }, + { + "filterListId": 119, + "tagId": 2 + }, + { + "filterListId": 138, + "tagId": 2 + }, + { + "filterListId": 142, + "tagId": 2 + }, + { + "filterListId": 177, + "tagId": 2 + }, + { + "filterListId": 181, + "tagId": 2 + }, + { + "filterListId": 182, + "tagId": 2 + }, + { + "filterListId": 183, + "tagId": 2 + }, + { + "filterListId": 213, + "tagId": 2 + }, + { + "filterListId": 215, + "tagId": 2 + }, + { + "filterListId": 228, + "tagId": 2 + }, + { + "filterListId": 231, + "tagId": 2 + }, + { + "filterListId": 239, + "tagId": 2 + }, + { + "filterListId": 252, + "tagId": 2 + }, + { + "filterListId": 253, + "tagId": 2 + }, + { + "filterListId": 277, + "tagId": 2 + }, + { + "filterListId": 316, + "tagId": 2 + }, + { + "filterListId": 319, + "tagId": 2 + }, + { + "filterListId": 320, + "tagId": 2 + }, + { + "filterListId": 324, + "tagId": 2 + }, + { + "filterListId": 328, + "tagId": 2 + }, + { + "filterListId": 329, + "tagId": 2 + }, + { + "filterListId": 330, + "tagId": 2 + }, + { + "filterListId": 339, + "tagId": 2 + }, + { + "filterListId": 346, + "tagId": 2 + }, + { + "filterListId": 372, + "tagId": 2 + }, + { + "filterListId": 374, + "tagId": 2 + }, + { + "filterListId": 380, + "tagId": 2 + }, + { + "filterListId": 383, + "tagId": 2 + }, + { + "filterListId": 396, + "tagId": 2 + }, + { + "filterListId": 441, + "tagId": 2 + }, + { + "filterListId": 446, + "tagId": 2 + }, + { + "filterListId": 467, + "tagId": 2 + }, + { + "filterListId": 468, + "tagId": 2 + }, + { + "filterListId": 480, + "tagId": 2 + }, + { + "filterListId": 481, + "tagId": 2 + }, + { + "filterListId": 515, + "tagId": 2 + }, + { + "filterListId": 516, + "tagId": 2 + }, + { + "filterListId": 517, + "tagId": 2 + }, + { + "filterListId": 523, + "tagId": 2 + }, + { + "filterListId": 538, + "tagId": 2 + }, + { + "filterListId": 539, + "tagId": 2 + }, + { + "filterListId": 557, + "tagId": 2 + }, + { + "filterListId": 563, + "tagId": 2 + }, + { + "filterListId": 67, + "tagId": 3 + }, + { + "filterListId": 157, + "tagId": 3 + }, + { + "filterListId": 447, + "tagId": 3 + }, + { + "filterListId": 449, + "tagId": 3 + }, + { + "filterListId": 450, + "tagId": 3 + }, + { + "filterListId": 451, + "tagId": 3 + }, + { + "filterListId": 469, + "tagId": 3 + }, + { + "filterListId": 2, + "tagId": 4 + }, + { + "filterListId": 247, + "tagId": 4 + }, + { + "filterListId": 259, + "tagId": 4 + }, + { + "filterListId": 41, + "tagId": 6 + }, + { + "filterListId": 58, + "tagId": 6 + }, + { + "filterListId": 91, + "tagId": 6 + }, + { + "filterListId": 191, + "tagId": 6 + }, + { + "filterListId": 193, + "tagId": 6 + }, + { + "filterListId": 194, + "tagId": 6 + }, + { + "filterListId": 195, + "tagId": 6 + }, + { + "filterListId": 196, + "tagId": 6 + }, + { + "filterListId": 208, + "tagId": 6 + }, + { + "filterListId": 209, + "tagId": 6 + }, + { + "filterListId": 210, + "tagId": 6 + }, + { + "filterListId": 211, + "tagId": 6 + }, + { + "filterListId": 302, + "tagId": 6 + }, + { + "filterListId": 352, + "tagId": 6 + }, + { + "filterListId": 417, + "tagId": 6 + }, + { + "filterListId": 418, + "tagId": 6 + }, + { + "filterListId": 471, + "tagId": 6 + }, + { + "filterListId": 518, + "tagId": 6 + }, + { + "filterListId": 519, + "tagId": 6 + }, + { + "filterListId": 520, + "tagId": 6 + }, + { + "filterListId": 605, + "tagId": 6 + }, + { + "filterListId": 44, + "tagId": 7 + }, + { + "filterListId": 57, + "tagId": 7 + }, + { + "filterListId": 139, + "tagId": 7 + }, + { + "filterListId": 140, + "tagId": 7 + }, + { + "filterListId": 185, + "tagId": 7 + }, + { + "filterListId": 421, + "tagId": 7 + }, + { + "filterListId": 427, + "tagId": 7 + }, + { + "filterListId": 495, + "tagId": 7 + }, + { + "filterListId": 496, + "tagId": 7 + }, + { + "filterListId": 87, + "tagId": 10 + }, + { + "filterListId": 321, + "tagId": 10 + }, + { + "filterListId": 322, + "tagId": 10 + }, + { + "filterListId": 323, + "tagId": 10 + }, + { + "filterListId": 367, + "tagId": 10 + }, + { + "filterListId": 368, + "tagId": 10 + }, + { + "filterListId": 395, + "tagId": 10 + }, + { + "filterListId": 188, + "tagId": 11 + }, + { + "filterListId": 490, + "tagId": 11 + }, + { + "filterListId": 2, + "tagId": 15 + }, + { + "filterListId": 40, + "tagId": 15 + }, + { + "filterListId": 73, + "tagId": 15 + }, + { + "filterListId": 249, + "tagId": 15 + }, + { + "filterListId": 453, + "tagId": 15 + }, + { + "filterListId": 522, + "tagId": 15 + } +] From 6d44480ecc86b1c26608ce272fb1017d0cd7bb98 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 8 Sep 2018 22:44:00 +0200 Subject: [PATCH 2/3] Minor text update --- data/FilterList.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index d9447a8dc..ad3080505 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -10870,7 +10870,7 @@ { "id": 603, "chatUrl": null, - "description": "This list aims to remove particularly disturbing content on YouTube that targets young children, as well as nursery rhymes, \"Finger Family\", \"Wrong Heads\", and other things that are hotbeds for extremely unproductive videos. Also supports YouTube on mobile browsers (but sadly not the apps).", + "description": "This list aims to remove particularly disturbing content on YouTube, DailyMotion, and Vimeo that targets young children, as well as nursery rhymes, \"Finger Family\", \"Wrong Heads\", and other things that are hotbeds for extremely unproductive videos. Also supports YouTube on mobile browsers (but sadly not the apps).", "descriptionSourceUrl": null, "discontinuedDate": null, "donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations", @@ -10943,4 +10943,4 @@ "syntaxId": 1, "viewUrl": "https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Hosts/GoodbyeAds.txt" } -] \ No newline at end of file +] From 4cbcae135905d256ba98e16137a905740fa798c7 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sat, 8 Sep 2018 22:59:12 +0200 Subject: [PATCH 3/3] Removed AdZHosts' tags --- data/FilterListTag.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 3e8163e03..71300d6e9 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -1499,22 +1499,6 @@ "filterListId": 493, "tagId": 11 }, - { - "filterListId": 500, - "tagId": 4 - }, - { - "filterListId": 501, - "tagId": 4 - }, - { - "filterListId": 502, - "tagId": 4 - }, - { - "filterListId": 503, - "tagId": 4 - }, { "filterListId": 506, "tagId": 3