From 3df9fc79f9e863aa6a535d08336d3bb70f46653c Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Sun, 17 Mar 2019 19:29:37 +0100 Subject: [PATCH] Mid-March pull, encore (#723) * Added the EasyList-lacking version of AdGuard English How this hasn't been done before, is anyone's guess. * Update FilterListMaintainer.json * Update FilterListLanguage.json * Update FilterListLanguage.json * Update FilterListLanguage.json * Adding KoreanList * Update FilterListLanguage.json * Update FilterListMaintainer.json * Update FilterListTag.json * Copying over a commit from part 2 to avoid conflicts * Update Language.json * Corrected the names of five lists * Added 2 new tags * Changed the tags of 22 lists --- data/FilterList.json | 35 ++++++-- data/FilterListLanguage.json | 8 ++ data/FilterListMaintainer.json | 8 ++ data/FilterListTag.json | 144 ++++++++++++--------------------- data/Language.json | 2 +- data/Tag.json | 12 ++- 6 files changed, 108 insertions(+), 101 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 081506cf6..839d38c8f 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -1978,7 +1978,7 @@ "homeUrl": "https://github.com/AdguardTeam/AdguardFilters", "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", "licenseId": 12, - "name": "AdGuard English Filter", + "name": "AdGuard English Filter + EasyList", "policyUrl": "https://kb.adguard.com/en/general/adguard-filter-policy", "syntaxId": 6, "updatedDate": "2019-02-11T13:50:09", @@ -10156,7 +10156,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "Pi-hole Parser - Cocos and Keeling Islands", + "name": "Pi-hole Parser - Cocos Islands", "publishedDate": "2017-08-25T02:08:54", "syntaxId": 2, "updatedDate": "2019-01-04T00:43:49", @@ -10948,7 +10948,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "Pi-hole Parser - Macedonia", + "name": "Pi-hole Parser - North Macedonia", "publishedDate": "2017-08-25T02:08:54", "syntaxId": 2, "updatedDate": "2019-01-04T00:43:49", @@ -12356,7 +12356,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "BulgarianListEasyList (Domains)", + "name": "Bulgarian List (Domains)", "publishedDate": "2017-09-02T01:07:36", "syntaxId": 2, "updatedDate": "2019-02-01T00:40:14", @@ -12477,7 +12477,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "EasyList Liste FR (Domains)", + "name": "Liste FR (Domains)", "publishedDate": "2017-09-02T01:07:36", "syntaxId": 2, "updatedDate": "2019-01-11T00:46:31", @@ -12862,7 +12862,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "RUAdListBitBlock (Domains)", + "name": "RU AdList BitBlock (Domains)", "publishedDate": "2017-09-05T08:14:36", "syntaxId": 2, "updatedDate": "2018-05-28T14:02:55", @@ -12873,7 +12873,7 @@ "homeUrl": "https://github.com/deathbybandaid/piholeparser", "issuesUrl": "https://github.com/deathbybandaid/piholeparser/issues", "licenseId": 14, - "name": "RUAdListCounters (Domains)", + "name": "RU AdList Counters (Domains)", "publishedDate": "2017-09-05T08:14:36", "syntaxId": 2, "updatedDate": "2019-02-01T00:40:14", @@ -16309,5 +16309,26 @@ "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 26, "viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=bindconfig&showintro=1&mimetype=plaintext" + }, + { + "id": 1528, + "description": "Filter that enables removing of the ads from websites with English content.", + "descriptionSourceUrl": "https://kb.adguard.com/en/general/adguard-ad-filters#english-filter", + "forumUrl": "https://forum.adguard.com/index.php?categories/filter-rules.66/", + "homeUrl": "https://github.com/AdguardTeam/AdguardFilters", + "issuesUrl": "https://github.com/AdguardTeam/AdguardFilters/issues", + "licenseId": 12, + "name": "AdGuard English Filter without EasyList", + "policyUrl": "https://kb.adguard.com/en/general/adguard-filter-policy", + "syntaxId": 6, + "viewUrl": "https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt" + }, + { + "id": 1529, + "homeUrl": "https://easylist.to/", + "licenseId": 3, + "name": "KoreanList", + "syntaxId": 3, + "viewUrl": "https://easylist-downloads.adblockplus.org/koreanlist.txt" } ] diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 445388d8e..79c3c16b4 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -1858,5 +1858,13 @@ { "filterListId": 1483, "languageId": 141 + }, + { + "filterListId": 1528, + "languageId": 110 + }, + { + "filterListId": 1529, + "languageId": 154 } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index a546c9620..73b21ea09 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -227,6 +227,10 @@ "filterListId": 800, "maintainerId": 7 }, + { + "filterListId": 1529, + "maintainerId": 7 + }, { "filterListId": 6, "maintainerId": 8 @@ -1147,6 +1151,10 @@ "filterListId": 351, "maintainerId": 46 }, + { + "filterListId": 1528, + "maintainerId": 46 + }, { "filterListId": 207, "maintainerId": 47 diff --git a/data/FilterListTag.json b/data/FilterListTag.json index 6d751f2a0..b07425a84 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -1403,6 +1403,10 @@ "filterListId": 303, "tagId": 14 }, + { + "filterListId": 303, + "tagId": 23 + }, { "filterListId": 304, "tagId": 3 @@ -2781,7 +2785,7 @@ }, { "filterListId": 656, - "tagId": 15 + "tagId": 23 }, { "filterListId": 657, @@ -3767,6 +3771,10 @@ "filterListId": 863, "tagId": 15 }, + { + "filterListId": 863, + "tagId": 22 + }, { "filterListId": 864, "tagId": 3 @@ -5509,19 +5517,11 @@ }, { "filterListId": 1321, - "tagId": 3 - }, - { - "filterListId": 1321, - "tagId": 6 + "tagId": 4 }, { "filterListId": 1322, - "tagId": 3 - }, - { - "filterListId": 1322, - "tagId": 6 + "tagId": 4 }, { "filterListId": 1323, @@ -5717,35 +5717,19 @@ }, { "filterListId": 1347, - "tagId": 3 - }, - { - "filterListId": 1347, - "tagId": 6 + "tagId": 22 }, { "filterListId": 1348, - "tagId": 3 - }, - { - "filterListId": 1348, - "tagId": 6 + "tagId": 22 }, { "filterListId": 1349, - "tagId": 3 - }, - { - "filterListId": 1349, - "tagId": 6 + "tagId": 4 }, { "filterListId": 1350, - "tagId": 3 - }, - { - "filterListId": 1350, - "tagId": 6 + "tagId": 4 }, { "filterListId": 1351, @@ -6077,19 +6061,11 @@ }, { "filterListId": 1393, - "tagId": 3 - }, - { - "filterListId": 1393, - "tagId": 6 + "tagId": 11 }, { "filterListId": 1394, - "tagId": 3 - }, - { - "filterListId": 1394, - "tagId": 6 + "tagId": 11 }, { "filterListId": 1395, @@ -6221,19 +6197,11 @@ }, { "filterListId": 1411, - "tagId": 3 - }, - { - "filterListId": 1411, - "tagId": 6 + "tagId": 22 }, { "filterListId": 1412, - "tagId": 3 - }, - { - "filterListId": 1412, - "tagId": 6 + "tagId": 22 }, { "filterListId": 1413, @@ -6301,19 +6269,11 @@ }, { "filterListId": 1421, - "tagId": 3 - }, - { - "filterListId": 1421, - "tagId": 6 + "tagId": 13 }, { "filterListId": 1422, - "tagId": 3 - }, - { - "filterListId": 1422, - "tagId": 6 + "tagId": 13 }, { "filterListId": 1423, @@ -6357,19 +6317,11 @@ }, { "filterListId": 1429, - "tagId": 3 - }, - { - "filterListId": 1429, - "tagId": 6 + "tagId": 4 }, { "filterListId": 1430, - "tagId": 3 - }, - { - "filterListId": 1430, - "tagId": 6 + "tagId": 4 }, { "filterListId": 1431, @@ -6421,35 +6373,19 @@ }, { "filterListId": 1437, - "tagId": 3 - }, - { - "filterListId": 1437, - "tagId": 6 + "tagId": 23 }, { "filterListId": 1438, - "tagId": 3 - }, - { - "filterListId": 1438, - "tagId": 6 + "tagId": 23 }, { "filterListId": 1439, - "tagId": 3 - }, - { - "filterListId": 1439, - "tagId": 6 + "tagId": 11 }, { "filterListId": 1440, - "tagId": 3 - }, - { - "filterListId": 1440, - "tagId": 6 + "tagId": 11 }, { "filterListId": 1441, @@ -6573,7 +6509,7 @@ }, { "filterListId": 1459, - "tagId": 15 + "tagId": 22 }, { "filterListId": 1460, @@ -7002,5 +6938,29 @@ { "filterListId": 1525, "tagId": 3 + }, + { + "filterListId": 1526, + "tagId": 2 + }, + { + "filterListId": 1526, + "tagId": 3 + }, + { + "filterListId": 1527, + "tagId": 2 + }, + { + "filterListId": 1527, + "tagId": 3 + }, + { + "filterListId": 1528, + "tagId": 2 + }, + { + "filterListId": 1529, + "tagId": 2 } ] diff --git a/data/Language.json b/data/Language.json index 4b4d7064e..e0080bc12 100644 --- a/data/Language.json +++ b/data/Language.json @@ -1,4 +1,4 @@ -[ +[ { "id": 1, "iso6391": "ab", diff --git a/data/Tag.json b/data/Tag.json index 098482c9f..765a55c9d 100644 --- a/data/Tag.json +++ b/data/Tag.json @@ -103,5 +103,15 @@ "id": 21, "description": "Lists that remove news stories of subjectively low quality", "name": "clickbait" + }, + { + "id": 22, + "description": "Blocks religious or superstitious content", + "name": "religious" + }, + { + "id": 23, + "description": "Blocks pages from link-shortening services", + "name": "shorteners" } -] \ No newline at end of file +]