From 23400d795bb366f893e291c6cb09c1c26e9a5107 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 1 Oct 2018 18:42:44 +0200 Subject: [PATCH 1/5] Added 4 new tags --- data/Tag.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/data/Tag.json b/data/Tag.json index 1d63c0d8e..8088869f6 100644 --- a/data/Tag.json +++ b/data/Tag.json @@ -78,5 +78,25 @@ "id": 16, "description": "Removes obstructing or annoying overlays", "name": "overlay" + }, + { + "id": 17, + "description": "Blocks gambling resources", + "name": "gambling" + }, + { + "id": 18, + "description": "Removes website-embedded fonts", + "name": "fonts" + }, + { + "id": 19, + "description": "Blocks resources from certain companies", + "name": "anti-corp" + }, + { + "id": 20, + "description": "Lists that are of special interest to IT admins", + "name": "admin" } -] \ No newline at end of file +] From 87dc53bf7449f5aafe6783de873108a1404c65ea Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 1 Oct 2018 19:08:52 +0200 Subject: [PATCH 2/5] Assigned another round of tags --- data/FilterListTag.json | 218 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 205 insertions(+), 13 deletions(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 8ec928e93..f4399b396 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -335,10 +335,18 @@ "filterListId": 78, "tagId": 2 }, + { + "filterListId": 78, + "tagId": 17 + }, { "filterListId": 79, "tagId": 2 }, + { + "filterListId": 79, + "tagId": 17 + }, { "filterListId": 80, "tagId": 2 @@ -391,6 +399,10 @@ "filterListId": 93, "tagId": 2 }, + { + "filterListId": 93, + "tagId": 17 + }, { "filterListId": 94, "tagId": 10 @@ -399,10 +411,18 @@ "filterListId": 95, "tagId": 2 }, + { + "filterListId": 95, + "tagId": 17 + }, { "filterListId": 96, "tagId": 2 }, + { + "filterListId": 97, + "tagId": 9 + }, { "filterListId": 98, "tagId": 9 @@ -457,16 +477,24 @@ }, { "filterListId": 103, - "tagId": 15 + "tagId": 17 }, { "filterListId": 104, "tagId": 2 }, + { + "filterListId": 104, + "tagId": 17 + }, { "filterListId": 105, "tagId": 2 }, + { + "filterListId": 105, + "tagId": 17 + }, { "filterListId": 106, "tagId": 2 @@ -483,6 +511,10 @@ "filterListId": 109, "tagId": 2 }, + { + "filterListId": 109, + "tagId": 17 + }, { "filterListId": 110, "tagId": 2 @@ -607,6 +639,10 @@ "filterListId": 136, "tagId": 3 }, + { + "filterListId": 137, + "tagId": 2 + }, { "filterListId": 138, "tagId": 2 @@ -1089,7 +1125,7 @@ }, { "filterListId": 249, - "tagId": 15 + "tagId": 18 }, { "filterListId": 250, @@ -1367,6 +1403,22 @@ "filterListId": 308, "tagId": 1 }, + { + "filterListId": 309, + "tagId": 1 + }, + { + "filterListId": 309, + "tagId": 2 + }, + { + "filterListId": 309, + "tagId": 3 + }, + { + "filterListId": 309, + "tagId": 6 + }, { "filterListId": 311, "tagId": 9 @@ -1791,6 +1843,10 @@ "filterListId": 403, "tagId": 15 }, + { + "filterListId": 403, + "tagId": 18 + }, { "filterListId": 405, "tagId": 9 @@ -1943,10 +1999,22 @@ "filterListId": 451, "tagId": 3 }, + { + "filterListId": 452, + "tagId": 2 + }, + { + "filterListId": 452, + "tagId": 3 + }, { "filterListId": 453, "tagId": 15 }, + { + "filterListId": 453, + "tagId": 18 + }, { "filterListId": 454, "tagId": 3 @@ -1999,6 +2067,34 @@ "filterListId": 472, "tagId": 4 }, + { + "filterListId": 472, + "tagId": 19 + }, + { + "filterListId": 473, + "tagId": 19 + }, + { + "filterListId": 474, + "tagId": 19 + }, + { + "filterListId": 475, + "tagId": 19 + }, + { + "filterListId": 476, + "tagId": 19 + }, + { + "filterListId": 477, + "tagId": 19 + }, + { + "filterListId": 478, + "tagId": 19 + }, { "filterListId": 474, "tagId": 4 @@ -2291,6 +2387,46 @@ "filterListId": 527, "tagId": 3 }, + { + "filterListId": 528, + "tagId": 19 + }, + { + "filterListId": 529, + "tagId": 19 + }, + { + "filterListId": 530, + "tagId": 19 + }, + { + "filterListId": 531, + "tagId": 19 + }, + { + "filterListId": 532, + "tagId": 19 + }, + { + "filterListId": 533, + "tagId": 19 + }, + { + "filterListId": 534, + "tagId": 19 + }, + { + "filterListId": 535, + "tagId": 19 + }, + { + "filterListId": 536, + "tagId": 19 + }, + { + "filterListId": 537, + "tagId": 19 + }, { "filterListId": 532, "tagId": 4 @@ -2311,6 +2447,46 @@ "filterListId": 539, "tagId": 2 }, + { + "filterListId": 546, + "tagId": 19 + }, + { + "filterListId": 547, + "tagId": 19 + }, + { + "filterListId": 548, + "tagId": 19 + }, + { + "filterListId": 549, + "tagId": 19 + }, + { + "filterListId": 550, + "tagId": 19 + }, + { + "filterListId": 551, + "tagId": 19 + }, + { + "filterListId": 552, + "tagId": 19 + }, + { + "filterListId": 553, + "tagId": 19 + }, + { + "filterListId": 554, + "tagId": 19 + }, + { + "filterListId": 555, + "tagId": 19 + }, { "filterListId": 551, "tagId": 4 @@ -2457,7 +2633,7 @@ }, { "filterListId": 589, - "tagId": 15 + "tagId": 17 }, { "filterListId": 590, @@ -2545,7 +2721,7 @@ }, { "filterListId": 604, - "tagId": 15 + "tagId": 20 }, { "filterListId": 605, @@ -2563,6 +2739,10 @@ "filterListId": 606, "tagId": 6 }, + { + "filterListId": 623, + "tagId": 18 + }, { "filterListId": 671, "tagId": 14 @@ -2591,6 +2771,10 @@ "filterListId": 719, "tagId": 10 }, + { + "filterListId": 734, + "tagId": 2 + }, { "filterListId": 734, "tagId": 11 @@ -2667,10 +2851,6 @@ "filterListId": 622, "tagId": 3 }, - { - "filterListId": 623, - "tagId": 3 - }, { "filterListId": 624, "tagId": 3 @@ -2733,19 +2913,19 @@ }, { "filterListId": 635, - "tagId": 15 + "tagId": 17 }, { "filterListId": 636, - "tagId": 15 + "tagId": 17 }, { "filterListId": 637, - "tagId": 15 + "tagId": 17 }, { "filterListId": 638, - "tagId": 15 + "tagId": 17 }, { "filterListId": 639, @@ -2951,6 +3131,18 @@ "filterListId": 689, "tagId": 3 }, + { + "filterListId": 690, + "tagId": 20 + }, + { + "filterListId": 691, + "tagId": 20 + }, + { + "filterListId": 692, + "tagId": 20 + }, { "filterListId": 692, "tagId": 6 @@ -3097,7 +3289,7 @@ }, { "filterListId": 730, - "tagId": 9 + "tagId": 18 }, { "filterListId": 731, From 0bc4b2cda6b36e8d569639cf1e513be3956968a2 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 1 Oct 2018 19:10:30 +0200 Subject: [PATCH 3/5] Removed a non-list --- data/FilterList.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 392d6aead..8683453b9 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -4490,15 +4490,6 @@ "syntaxId": 4, "viewUrl": "https://raw.githubusercontent.com/uBlockOrigin/uAssets/master/filters/resource-abuse.txt" }, - { - "id": 411, - "descriptionSourceUrl": "", - "homeUrl": "https://gist.github.com/BBcan177", - "licenseId": 18, - "name": "pfBlockerNG - Blacklist Configuration", - "syntaxId": 2, - "viewUrl": "https://gist.githubusercontent.com/BBcan177/b91d3c25667d326411b6fc4eb5c1f080/raw/7e23b07148adf030262f056870373c8f1ac2056c/squidblacklist_global_usage" - }, { "id": 412, "homeUrl": "https://gist.github.com/BBcan177", From 65f00153f33f6de88c0abe0d3ee8dcac9404cf9e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 1 Oct 2018 19:14:58 +0200 Subject: [PATCH 4/5] Added one additional tag --- data/Tag.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/Tag.json b/data/Tag.json index 8088869f6..8efe3e0c5 100644 --- a/data/Tag.json +++ b/data/Tag.json @@ -98,5 +98,10 @@ "id": 20, "description": "Lists that are of special interest to IT admins", "name": "admin" + }, + { + "id": 21, + "description": "Lists that remove news stories of subjectively low quality", + "name": "clickbait" } ] From 75c7379604917f854c2735231a1cbb689155b4ff Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Mon, 1 Oct 2018 19:21:01 +0200 Subject: [PATCH 5/5] Assigned lists to the new Clickbait tag --- data/FilterListTag.json | 42 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/data/FilterListTag.json b/data/FilterListTag.json index f4399b396..f60364bd5 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -91,6 +91,10 @@ "filterListId": 18, "tagId": 9 }, + { + "filterListId": 18, + "tagId": 21 + }, { "filterListId": 19, "tagId": 1 @@ -479,6 +483,10 @@ "filterListId": 103, "tagId": 17 }, + { + "filterListId": 103, + "tagId": 21 + }, { "filterListId": 104, "tagId": 2 @@ -487,6 +495,10 @@ "filterListId": 104, "tagId": 17 }, + { + "filterListId": 104, + "tagId": 21 + }, { "filterListId": 105, "tagId": 2 @@ -495,18 +507,34 @@ "filterListId": 105, "tagId": 17 }, + { + "filterListId": 105, + "tagId": 21 + }, { "filterListId": 106, "tagId": 2 }, + { + "filterListId": 106, + "tagId": 21 + }, { "filterListId": 107, "tagId": 2 }, + { + "filterListId": 107, + "tagId": 21 + }, { "filterListId": 108, "tagId": 2 }, + { + "filterListId": 108, + "tagId": 21 + }, { "filterListId": 109, "tagId": 2 @@ -519,6 +547,10 @@ "filterListId": 110, "tagId": 2 }, + { + "filterListId": 110, + "tagId": 21 + }, { "filterListId": 111, "tagId": 2 @@ -1049,7 +1081,7 @@ }, { "filterListId": 232, - "tagId": 15 + "tagId": 21 }, { "filterListId": 233, @@ -1681,7 +1713,7 @@ }, { "filterListId": 371, - "tagId": 15 + "tagId": 21 }, { "filterListId": 372, @@ -1767,6 +1799,10 @@ "filterListId": 389, "tagId": 13 }, + { + "filterListId": 389, + "tagId": 21 + }, { "filterListId": 390, "tagId": 15 @@ -2649,7 +2685,7 @@ }, { "filterListId": 593, - "tagId": 15 + "tagId": 21 }, { "filterListId": 594,