From e31ebecad037e6f19d0f811812af1d09f11d576e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 11:03:28 +0200 Subject: [PATCH 1/4] Added maintainers for 172 lists --- data/FilterListMaintainer.json | 692 ++++++++++++++++++++++++++++++++- 1 file changed, 690 insertions(+), 2 deletions(-) diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 92ca4f54d..7c23c8604 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -1090,5 +1090,693 @@ { "filterListId": 489, "maintainerId": 84 - } -] \ No newline at end of file + }, + { + "filterListId": 32, + "maintainerId": 91 +}, +{ + "filterListId": 40, + "maintainerId": 89 +}, +{ + "filterListId": 41, + "maintainerId": 89 +}, +{ + "filterListId": 42, + "maintainerId": 89 +}, +{ + "filterListId": 43, + "maintainerId": 89 +}, +{ + "filterListId": 44, + "maintainerId": 89 +}, +{ + "filterListId": 45, + "maintainerId": 89 +}, +{ + "filterListId": 46, + "maintainerId": 89 +}, +{ + "filterListId": 47, + "maintainerId": 89 +}, +{ + "filterListId": 48, + "maintainerId": 89 +}, +{ + "filterListId": 55, + "maintainerId": 89 +}, +{ + "filterListId": 57, + "maintainerId": 89 +}, +{ + "filterListId": 58, + "maintainerId": 89 +}, +{ + "filterListId": 73, + "maintainerId": 89 +}, +{ + "filterListId": 74, + "maintainerId": 89 +}, +{ + "filterListId": 78, + "maintainerId": 93 +}, +{ + "filterListId": 79, + "maintainerId": 93 +}, +{ + "filterListId": 80, + "maintainerId": 93 +}, +{ + "filterListId": 93, + "maintainerId": 93 +}, +{ + "filterListId": 95, + "maintainerId": 93 +}, +{ + "filterListId": 96, + "maintainerId": 93 +}, +{ + "filterListId": 97, + "maintainerId": 6 +}, +{ + "filterListId": 98, + "maintainerId": 6 +}, +{ + "filterListId": 102, + "maintainerId": 94 +}, +{ + "filterListId": 103, + "maintainerId": 93 +}, +{ + "filterListId": 104, + "maintainerId": 93 +}, +{ + "filterListId": 105, + "maintainerId": 93 +}, +{ + "filterListId": 106, + "maintainerId": 93 +}, +{ + "filterListId": 107, + "maintainerId": 93 +}, +{ + "filterListId": 108, + "maintainerId": 93 +}, +{ + "filterListId": 109, + "maintainerId": 93 +}, +{ + "filterListId": 110, + "maintainerId": 93 +}, +{ + "filterListId": 111, + "maintainerId": 93 +}, +{ + "filterListId": 112, + "maintainerId": 93 +}, +{ + "filterListId": 131, + "maintainerId": 92 +}, +{ + "filterListId": 132, + "maintainerId": 92 +}, +{ + "filterListId": 134, + "maintainerId": 92 +}, +{ + "filterListId": 137, + "maintainerId": 93 +}, +{ + "filterListId": 150, + "maintainerId": 92 +}, +{ + "filterListId": 173, + "maintainerId": 86 +}, +{ + "filterListId": 185, + "maintainerId": 86 +}, +{ + "filterListId": 186, + "maintainerId": 86 +}, +{ + "filterListId": 187, + "maintainerId": 86 +}, +{ + "filterListId": 188, + "maintainerId": 86 +}, +{ + "filterListId": 189, + "maintainerId": 86 +}, +{ + "filterListId": 190, + "maintainerId": 85 +}, +{ + "filterListId": 191, + "maintainerId": 85 +}, +{ + "filterListId": 192, + "maintainerId": 85 +}, +{ + "filterListId": 193, + "maintainerId": 23 +}, +{ + "filterListId": 194, + "maintainerId": 23 +}, +{ + "filterListId": 195, + "maintainerId": 23 +}, +{ + "filterListId": 196, + "maintainerId": 23 +}, +{ + "filterListId": 208, + "maintainerId": 23 +}, +{ + "filterListId": 209, + "maintainerId": 23 +}, +{ + "filterListId": 210, + "maintainerId": 23 +}, +{ + "filterListId": 211, + "maintainerId": 23 +}, +{ + "filterListId": 212, + "maintainerId": 85 +}, +{ + "filterListId": 229, + "maintainerId": 6 +}, +{ + "filterListId": 240, + "maintainerId": 7 +}, +{ + "filterListId": 241, + "maintainerId": 7 +}, +{ + "filterListId": 242, + "maintainerId": 7 +}, +{ + "filterListId": 243, + "maintainerId": 7 +}, +{ + "filterListId": 244, + "maintainerId": 7 +}, +{ + "filterListId": 247, + "maintainerId": 14 +}, +{ + "filterListId": 249, + "maintainerId": 14 +}, +{ + "filterListId": 250, + "maintainerId": 14 +}, +{ + "filterListId": 254, + "maintainerId": 14 +}, +{ + "filterListId": 255, + "maintainerId": 14 +}, +{ + "filterListId": 256, + "maintainerId": 14 +}, +{ + "filterListId": 257, + "maintainerId": 14 +}, +{ + "filterListId": 258, + "maintainerId": 14 +}, +{ + "filterListId": 259, + "maintainerId": 14 +}, +{ + "filterListId": 260, + "maintainerId": 14 +}, +{ + "filterListId": 261, + "maintainerId": 14 +}, +{ + "filterListId": 262, + "maintainerId": 14 +}, +{ + "filterListId": 263, + "maintainerId": 14 +}, +{ + "filterListId": 264, + "maintainerId": 14 +}, +{ + "filterListId": 265, + "maintainerId": 14 +}, +{ + "filterListId": 266, + "maintainerId": 14 +}, +{ + "filterListId": 269, + "maintainerId": 7 +}, +{ + "filterListId": 270, + "maintainerId": 88 +}, +{ + "filterListId": 271, + "maintainerId": 88 +}, +{ + "filterListId": 285, + "maintainerId": 88 +}, +{ + "filterListId": 286, + "maintainerId": 88 +}, +{ + "filterListId": 287, + "maintainerId": 88 +}, +{ + "filterListId": 288, + "maintainerId": 88 +}, +{ + "filterListId": 289, + "maintainerId": 7 +}, +{ + "filterListId": 292, + "maintainerId": 7 +}, +{ + "filterListId": 293, + "maintainerId": 7 +}, +{ + "filterListId": 294, + "maintainerId": 7 +}, +{ + "filterListId": 295, + "maintainerId": 7 +}, +{ + "filterListId": 301, + "maintainerId": 7 +}, +{ + "filterListId": 303, + "maintainerId": 88 +}, +{ + "filterListId": 304, + "maintainerId": 88 +}, +{ + "filterListId": 306, + "maintainerId": 6 +}, +{ + "filterListId": 436, + "maintainerId": 64 +}, +{ + "filterListId": 452, + "maintainerId": 61 +}, +{ + "filterListId": 453, + "maintainerId": 61 +}, +{ + "filterListId": 454, + "maintainerId": 61 +}, +{ + "filterListId": 455, + "maintainerId": 61 +}, +{ + "filterListId": 460, + "maintainerId": 61 +}, +{ + "filterListId": 461, + "maintainerId": 61 +}, +{ + "filterListId": 462, + "maintainerId": 61 +}, +{ + "filterListId": 472, + "maintainerId": 90 +}, +{ + "filterListId": 473, + "maintainerId": 90 +}, +{ + "filterListId": 474, + "maintainerId": 90 +}, +{ + "filterListId": 475, + "maintainerId": 90 +}, +{ + "filterListId": 476, + "maintainerId": 90 +}, +{ + "filterListId": 477, + "maintainerId": 90 +}, +{ + "filterListId": 478, + "maintainerId": 90 +}, +{ + "filterListId": 564, + "maintainerId": 14 +}, +{ + "filterListId": 607, + "maintainerId": 34 +}, +{ + "filterListId": 608, + "maintainerId": 34 +}, +{ + "filterListId": 609, + "maintainerId": 34 +}, +{ + "filterListId": 610, + "maintainerId": 34 +}, +{ + "filterListId": 611, + "maintainerId": 34 +}, +{ + "filterListId": 612, + "maintainerId": 34 +}, +{ + "filterListId": 613, + "maintainerId": 34 +}, +{ + "filterListId": 614, + "maintainerId": 34 +}, +{ + "filterListId": 615, + "maintainerId": 34 +}, +{ + "filterListId": 616, + "maintainerId": 34 +}, +{ + "filterListId": 617, + "maintainerId": 91 +}, +{ + "filterListId": 635, + "maintainerId": 87 +}, +{ + "filterListId": 636, + "maintainerId": 87 +}, +{ + "filterListId": 637, + "maintainerId": 87 +}, +{ + "filterListId": 638, + "maintainerId": 87 +}, +{ + "filterListId": 639, + "maintainerId": 87 +}, +{ + "filterListId": 640, + "maintainerId": 87 +}, +{ + "filterListId": 641, + "maintainerId": 87 +}, +{ + "filterListId": 642, + "maintainerId": 87 +}, +{ + "filterListId": 643, + "maintainerId": 87 +}, +{ + "filterListId": 644, + "maintainerId": 87 +}, +{ + "filterListId": 645, + "maintainerId": 87 +}, +{ + "filterListId": 647, + "maintainerId": 87 +}, +{ + "filterListId": 648, + "maintainerId": 87 +}, +{ + "filterListId": 649, + "maintainerId": 87 +}, +{ + "filterListId": 650, + "maintainerId": 87 +}, +{ + "filterListId": 651, + "maintainerId": 87 +}, +{ + "filterListId": 652, + "maintainerId": 87 +}, +{ + "filterListId": 653, + "maintainerId": 87 +}, +{ + "filterListId": 654, + "maintainerId": 87 +}, +{ + "filterListId": 655, + "maintainerId": 87 +}, +{ + "filterListId": 656, + "maintainerId": 87 +}, +{ + "filterListId": 657, + "maintainerId": 87 +}, +{ + "filterListId": 658, + "maintainerId": 94 +}, +{ + "filterListId": 659, + "maintainerId": 94 +}, +{ + "filterListId": 660, + "maintainerId": 94 +}, +{ + "filterListId": 661, + "maintainerId": 94 +}, +{ + "filterListId": 672, + "maintainerId": 91 +}, +{ + "filterListId": 673, + "maintainerId": 91 +}, +{ + "filterListId": 674, + "maintainerId": 91 +}, +{ + "filterListId": 675, + "maintainerId": 91 +}, +{ + "filterListId": 676, + "maintainerId": 91 +}, +{ + "filterListId": 677, + "maintainerId": 91 +}, +{ + "filterListId": 681, + "maintainerId": 10 +}, +{ + "filterListId": 685, + "maintainerId": 88 +}, +{ + "filterListId": 759, + "maintainerId": 14 +}, +{ + "filterListId": 762, + "maintainerId": 14 +}, +{ + "filterListId": 763, + "maintainerId": 14 +}, +{ + "filterListId": 764, + "maintainerId": 14 +}, +{ + "filterListId": 765, + "maintainerId": 14 +}, +{ + "filterListId": 773, + "maintainerId": 7 +}, +{ + "filterListId": 774, + "maintainerId": 14 +}, +{ + "filterListId": 778, + "maintainerId": 7 +}, +{ + "filterListId": 779, + "maintainerId": 7 +}, +{ + "filterListId": 782, + "maintainerId": 7 +}, +{ + "filterListId": 785, + "maintainerId": 14 +}, +{ + "filterListId": 789, + "maintainerId": 7 +}, +{ + "filterListId": 790, + "maintainerId": 7 +}, +{ + "filterListId": 796, + "maintainerId": 7 +}, +{ + "filterListId": 799, + "maintainerId": 7 +}, +{ + "filterListId": 805, + "maintainerId": 92 +} +] From cfbe99cdbbac77aa3a9257b4096c4d22388c2d40 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 11:19:21 +0200 Subject: [PATCH 2/4] Added 10 maintainers --- data/Maintainer.json | 56 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/data/Maintainer.json b/data/Maintainer.json index d6134b4f6..be48e1e56 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -437,5 +437,59 @@ "homeUrl": "https://github.com/EnergizedProtection", "name": "Team Boltz", "twitterHandle": "adroitadorkhan" + }, + { + "id": 85, + "name": "FadeMind" + }, + { + "id": 86, + "homeUrl": "http://rlwpx.free.fr/", + "name": "Airelle" + }, + { + "id": 87, + "name": "Aegis Team", + "twitterHandle": "TeamAEGISgg" + }, + { + "id": 88, + "emailAddress": "Info@RiskAnalytics.com", + "homeUrl": "https://www.riskanalytics.com/", + "name": "RiskAnalytics" + }, + { + "id": 89, + "emailAddress": "support@it-mate.co.uk", + "homeUrl": "https://hosts-file.net/", + "name": "Hosts-File Dot Net", + }, + { + "id": 90, + "emailAddress": "jmdugan_pubprofile_1522347973@biocontact.org", + "homeUrl": "https://biocontact.org/jmdugan/", + "name": "Jonathan Dugan" + }, + { + "id": 91, + "emailAddress": "pgl@yoyo.org", + "homeUrl": "https://pgl.yoyo.org/", + "name": "Peter Lowe" + }, + { + "id": 92, + "homeUrl": "https://code.google.com/archive/p/ruadlist/", + "name": "RU AdList" + }, + { + "id": 93, + "emailAddress": "steveb@stevenblack.com", + "homeUrl": "http://stevenblack.com/", + "name": "Steven Black", + "twitterHandle": "steveblack" + }, + { + "id": 94, + "name": "yourduskquibbles" } -] \ No newline at end of file +] From cd353836d4e246ceb4b4e063bdf111f8db654b02 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 11:22:42 +0200 Subject: [PATCH 3/4] Some extra maintenance, part 1 --- data/FilterList.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 0e3e4f87e..b056919a1 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -5133,7 +5133,7 @@ "emailAddress": "mail.energized@protonmail.com", "homeUrl": "https://github.com/yecarrillo/adblock-colombia", "issuesUrl": "https://github.com/yecarrillo/adblock-colombia/issues", - "licenseId": 3, + "licenseId": 4, "name": "yecarrillo's ad-blocking subscription for Colombian sites", "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/yecarrillo/adblock-colombia/master/adblock_co.txt" @@ -8147,7 +8147,7 @@ "forumUrl": "https://forums.lanik.us/", "homeUrl": "https://easylist.to/", "licenseId": 16, - "name": "Fanboy's Annoyance List", + "name": "Fanboy's Annoyance List (TPL)", "syntaxId": 10, "viewUrl": "https://easylist-msie.adblockplus.org/fanboy-annoyance.tpl" }, @@ -8187,7 +8187,7 @@ "id": 779, "homeUrl": "https://easylist.to/", "licenseId": 4, - "name": "EasyList Italy + Italy (TPL)", + "name": "EasyList Italy + EasyList (TPL)", "syntaxId": 10, "viewUrl": "https://easylist-msie.adblockplus.org/easylistitaly+easylist.tpl" }, From f2af7e60f25ab7a4a50de504ce6b4939e4179dc2 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 3 Oct 2018 11:23:52 +0200 Subject: [PATCH 4/4] Some extra maintenance, part 2 --- data/FilterListLanguage.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index c50cfc581..50d0da86f 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -857,11 +857,11 @@ }, { "filterListId": 670, - "languageId": 43 + "languageId": 44 }, { "filterListId": 680, - "languageId": 43 + "languageId": 44 }, { "filterListId": 688,